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

[FIRE-36087] Fix crash in updateImagesCreateTextures accessing potentially freed image pointer 

Merged upstream in SLViewer PR#4984
master
Hecklezz 2025-11-13 01:45:07 +10:00
parent e50dd76c61
commit 5fb9e75cd8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewertexturelist.cpp
View File

@ -1124,7 +1124,6 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)
imagep->postCreateTexture(); imagep->postCreateTexture();
imagep->mCreatePending = false; imagep->mCreatePending = false;
mCreateTextureList.pop();
if (imagep->hasGLTexture() && imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel() && if (imagep->hasGLTexture() && imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel() &&
(imagep->getDesiredDiscardLevel() <= MAX_DISCARD_LEVEL)) (imagep->getDesiredDiscardLevel() <= MAX_DISCARD_LEVEL))
@ -1136,6 +1135,8 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)
imagep->scaleDown(); imagep->scaleDown();
} }
mCreateTextureList.pop();
if (create_timer.getElapsedTimeF32() > max_time) if (create_timer.getElapsedTimeF32() > max_time)
{ {
break; break;