Pull in downstream -bear, viewer-release and become version 3.7.5

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp
index 294f68b122..525aa8d78c 100755
--- a/indra/llimage/llimagepng.cpp
+++ b/indra/llimage/llimagepng.cpp
@@ -94,6 +94,13 @@ BOOL LLImagePNG::decode(LLImageRaw* raw_image, F32 decode_time)
         return FALSE;
     }
 
+	// Check to make sure that this instance has been initialized with data
+	if (!raw_image->getData())
+	{
+		setLastError("LLImagePNG trying to decode an image into unallocated LLImageRaw!");
+		return FALSE;
+	}
+
 	// Decode the PNG data into the raw image
 	LLPngWrapper pngWrapper;
 	if (!pngWrapper.isValidPng(getData()))