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

MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()

meow-7.2.2
AndreyL ProductEngine 2016-12-08 17:21:05 +02:00
parent 2abd0eef41
commit a65b586b18
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llimage/llimage.cpp
View File

@ -800,7 +800,7 @@ U8* LLImageBase::getData()
return mData;
}
bool LLImageBase::isBufferInvalid()
bool LLImageBase::isBufferInvalid() const
{
return mBadBufferAllocation || mData == NULL ;
}

2
indra/llimage/llimage.h
View File

@ -141,7 +141,7 @@ public:
const U8 *getData() const ;
U8 *getData() ;
bool isBufferInvalid() ;
bool isBufferInvalid() const;
void setSize(S32 width, S32 height, S32 ncomponents);
U8* allocateDataSize(S32 width, S32 height, S32 ncomponents, S32 size = -1); // setSize() + allocateData()

6
indra/llrender/llimagegl.cpp
View File

@ -1267,6 +1267,12 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S
llassert(gGLManager.mInited);
stop_glerror();
if (!imageraw || imageraw->isBufferInvalid())
{
LL_WARNS() << "Trying to create a texture from invalid image data" << LL_ENDL;
return FALSE;
}
if (discard_level < 0)
{
llassert(mCurrentDiscardLevel >= 0);