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

Crash avoidance for compositeUnscaled4onto3

meow-7.2.2
Beq 2020-10-22 22:52:02 +01:00
parent db0397a629
commit b785b9d1ae
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
indra/llimage/llimage.cpp
View File

@ -1079,9 +1079,10 @@ void LLImageRaw::composite( LLImageRaw* src )
return;
}
llassert(3 == src->getComponents());
llassert(3 == dst->getComponents());
// <FS:Beq> These assertions are nonsense.
// llassert(3 == src->getComponents());
// llassert(3 == dst->getComponents());
// </FS:Beq>
if( 3 == dst->getComponents() )
{
if( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) )
@ -1143,12 +1144,34 @@ void LLImageRaw::compositeUnscaled4onto3( LLImageRaw* src )
{
LLImageRaw* dst = this; // Just for clarity.
llassert( (3 == src->getComponents()) || (4 == src->getComponents()) );
// <FS:Beq> Correct bad assertion
// llassert( (3 == src->getComponents()) || (4 == src->getComponents()) );
llassert( (4 == src->getComponents()) || (3 == dst->getComponents()) );
// </FS:Beq>
llassert( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) );
U8* src_data = src->getData();
U8* dst_data = dst->getData();
S32 pixels = getWidth() * getHeight();
// <FS:Beq> suspicious crash avoid potential causes.
if(!src_data)
{
LL_WARNS() << "source is null!" << LL_ENDL;
return;
}
if(!dst_data)
{
LL_WARNS() << "destination is null!" << LL_ENDL;
return;
}
auto src_comps = src->getComponents();
if( src_comps != 4)
{
// This should never be reached, buit apparently it is.
LL_WARNS() << "src has incorrect number of layers (" << src_comps << ")" << LL_ENDL;
return;
}
// </FS:Beq>
while( pixels-- )
{
U8 alpha = src_data[3];

8
indra/newview/llvlcomposition.cpp
View File

@ -307,6 +307,14 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
mDetailTextures[i]->getComponents() != 3)
{
LLPointer<LLImageRaw> newraw = new LLImageRaw(BASE_SIZE, BASE_SIZE, 3);
//<FS:Beq> guard against bad alloc here that leads to crash in composite
if(!newraw)
{
// Not much that is useful to do here, this ship is sinking it seems.
LL_WARNS("Terrain") << "allocation of new raw image failed" << LL_ENDL;
return(FALSE);
}
// </FS:Beq>
newraw->composite(mRawImages[i]);
mRawImages[i] = newraw; // deletes old
}