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

Crashfix: Don't blindly trust getImage() returns a valid pointer.

Nicky 2012-07-10 20:12:31 +02:00
parent 87afa47c98
commit 35b757d6c0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llvoavatar.cpp
View File

@ -9102,6 +9102,11 @@ BOOL LLVOAvatar::isTextureDefined(LLVOAvatarDefines::ETextureIndex te, U32 index
return FALSE;
}
// <FS:ND> getImage(te, index) can return 0 in some edge cases.
if( !getImage( te, index ) )
return FALSE;
// </FS:ND>
return (getImage(te, index)->getID() != IMG_DEFAULT_AVATAR &&
getImage(te, index)->getID() != IMG_DEFAULT);
}