From 61f3bf8a4799016f6a50007314816cddb1dff030 Mon Sep 17 00:00:00 2001
From: Stinson Linden <stinson@lindenlab.com>
Date: Fri, 6 Jun 2014 19:30:41 +0100
Subject: MAINT-4137: Correcting a potential crash.  This change should fix the
 most probable location of a callstack being reported by the crash reporter. 
 However, there is no reproduction yet, so hard to test whether this actually
 patches the crash occcurrence.

---
 indra/newview/lllocalbitmaps.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 92587a911a..6d1a240ce5 100755
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -213,8 +213,11 @@ bool LLLocalBitmap::updateSelf(EUpdateType optional_firstupdate)
 
 						// remove old_id from gimagelist
 						LLViewerFetchedTexture* image = gTextureList.findImage(old_id);
-						gTextureList.deleteImage(image);
-						image->unref();
+						if (image != NULL)
+						{
+							gTextureList.deleteImage(image);
+							image->unref();
+						}
 					}
 
 					mUpdateRetries = LL_LOCAL_UPDATE_RETRIES;
-- 
cgit v1.2.3