Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use C allocation in LLImage

Browse Source 
because LLTextureCache/LLTextureFetch feed it new[]ed data!
This commit is contained in:
Siana Gearz
2011-03-15 23:26:24 +01:00
parent 34fe62ba53
commit ee60606a04
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
indra/llimage/llimage.cpp
View File

@@ -139,7 +139,7 @@ void LLImageBase::sanityCheck()
void LLImageBase::deleteData()
{
if(mData)
free(mData);//delete[] mData;
delete[] mData;
mData = NULL;
mDataSize = 0;
}
@@ -166,17 +166,14 @@ U8* LLImageBase::allocateData(S32 size)
{
deleteData(); // virtual
mBadBufferAllocation = FALSE ;
U8 *data = (U8 *)realloc(mData,sizeof(U8)*size);//new U8[size];
if (!data)
mData = new U8[size];
if (!mData)
{
if(mData)
free(mData);
llwarns << "allocate image data: " << size << llendl;
size = 0 ;
mWidth = mHeight = 0 ;
mBadBufferAllocation = TRUE ;
}
mData = data;
mDataSize = size;
}
@@ -186,17 +183,25 @@ U8* LLImageBase::allocateData(S32 size)
// virtual
U8* LLImageBase::reallocateData(S32 size)
{
LLMemType mt1((LLMemType::EMemType)mMemType);
U8 *data = (U8 *)realloc(mData,sizeof(U8)*size);
if(data)
{
mData = data;
mDataSize = size;
}
else
llwarns << "Out of memory in LLImageBase::reallocateData" << llendl;
if(mData && (mDataSize == size))
return mData;
return data;
LLMemType mt1((LLMemType::EMemType)mMemType);
U8 *new_datap = new U8[size];
if (!new_datap)
{
llwarns << "Out of memory in LLImageBase::reallocateData" << llendl;
return 0;
}
if (mData)
{
S32 bytes = llmin(mDataSize, size);
memcpy(new_datap, mData, bytes); /* Flawfinder: ignore */
delete[] mData;
}
mData = new_datap;
mDataSize = size;
return mData;
}
const U8* LLImageBase::getData() const