summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-08-04 16:58:21 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-08-04 16:58:21 -0600
commitcd628d8ea82cc61bb4dd57a74e2f7d63847480bb (patch)
treee95c13d1a70fca1ae2c6edf223c0ef8bbec64877 /indra
parentaaa41211c83a9dcc9ff3db84c7e4b9de985be692 (diff)
merge the fix of SNOW-793: memory leak in LLImageFormatted::appendData
Diffstat (limited to 'indra')
-rw-r--r--indra/llimage/llimage.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index 0fc5ca1ad6..1566389e30 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -1553,6 +1553,7 @@ void LLImageFormatted::appendData(U8 *data, S32 size)
S32 newsize = cursize + size;
reallocateData(newsize);
memcpy(getData() + cursize, data, size);
+ delete[] data;
}
}
}