diff options
author | simon <none@none> | 2014-03-26 10:08:19 -0700 |
---|---|---|
committer | simon <none@none> | 2014-03-26 10:08:19 -0700 |
commit | 70006f4a5651ebaa0362ec2f95b5dda13f72e5c7 (patch) | |
tree | 6e1f7e8ccea28fa830bca7f2508a626f6ca907c9 /indra/llimage/llimagepng.cpp | |
parent | 73ef75498692e7b7cecb4960f4e308061917d86e (diff) | |
parent | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (diff) |
Pull in downstream -tiger, -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/llimage/llimagepng.cpp')
-rwxr-xr-x | indra/llimage/llimagepng.cpp | 7 |
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())) |