diff options
| author | Hecklezz <tj8@live.com.au> | 2025-11-12 23:27:46 +1000 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-11-12 22:07:13 +0200 |
| commit | 1020b5a268b2ff5d427a8a9217a6c8d8432d75b3 (patch) | |
| tree | 35d5f232e20304c93920beb491751bfe4d0d6284 /indra/newview/llviewertexturelist.cpp | |
| parent | 3b0c03451d9eac9644a9dca283ec7707402b6362 (diff) | |
Fix crash in updateImagesCreateTextures accessing potentially freed image pointer
Signed-off-by: Hecklezz <tj8@live.com.au>
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 6f79532ec3..11ca3098fd 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1111,7 +1111,6 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time) imagep->postCreateTexture(); imagep->mCreatePending = false; - mCreateTextureList.pop(); if (imagep->hasGLTexture() && imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel() && (imagep->getDesiredDiscardLevel() <= MAX_DISCARD_LEVEL)) @@ -1123,6 +1122,8 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time) imagep->scaleDown(); } + mCreateTextureList.pop(); + if (create_timer.getElapsedTimeF32() > max_time) { break; |