livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6818 Fix for LLImageBase::allocateData crash

meow-7.2.2
AndreyL ProductEngine 2016-10-19 01:12:52 +03:00
parent 30c8ea4d2c
commit f75ea457c8
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
indra/llimage/llimage.cpp
View File

@ -705,18 +705,21 @@ void LLImageBase::deleteData()
// virtual
U8* LLImageBase::allocateData(S32 size)
{
//make this function thread-safe.
static const U32 MAX_BUFFER_SIZE = 4096 * 4096 * 16; //256 MB
mBadBufferAllocation = false;
if (size < 0)
{
size = mWidth * mHeight * mComponents;
if (size <= 0)
{
LL_ERRS() << llformat("LLImageBase::allocateData called with bad dimensions: %dx%dx%d",mWidth,mHeight,(S32)mComponents) << LL_ENDL;
LL_WARNS() << llformat("LLImageBase::allocateData called with bad dimensions: %dx%dx%d",mWidth,mHeight,(S32)mComponents) << LL_ENDL;
mBadBufferAllocation = true;
}
}
//make this function thread-safe.
static const U32 MAX_BUFFER_SIZE = 4096 * 4096 * 16 ; //256 MB
if (size < 1 || size > MAX_BUFFER_SIZE)
}
if (!mBadBufferAllocation && (size < 1 || size > MAX_BUFFER_SIZE))
{
LL_INFOS() << "width: " << mWidth << " height: " << mHeight << " components: " << mComponents << LL_ENDL ;
if(mAllowOverSize)
@ -725,25 +728,31 @@ U8* LLImageBase::allocateData(S32 size)
}
else
{
LL_ERRS() << "LLImageBase::allocateData: bad size: " << size << LL_ENDL;
LL_WARNS() << "LLImageBase::allocateData: bad size: " << size << LL_ENDL;
mBadBufferAllocation = true;
}
}
if (!mData || size != mDataSize)
if (!mBadBufferAllocation && (!mData || size != mDataSize))
{
deleteData(); // virtual
mBadBufferAllocation = false ;
mData = (U8*)ALLOCATE_MEM(sPrivatePoolp, size);
if (!mData)
{
LL_WARNS() << "Failed to allocate image data size [" << size << "]" << LL_ENDL;
size = 0 ;
mWidth = mHeight = 0 ;
mBadBufferAllocation = true ;
mBadBufferAllocation = true;
}
mDataSize = size;
claimMem(mDataSize);
}
if (mBadBufferAllocation)
{
size = 0;
mWidth = mHeight = 0;
mData = NULL;
}
mDataSize = size;
claimMem(mDataSize);
return mData;
}