summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-10-07 07:03:35 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-10-07 07:03:35 +0300
commit028fd679296cd241e7dd0aac3e1c33480a9d3c2c (patch)
tree43b26969842dca99f509d6956513bbdedab07ada /indra/newview
parent30d5e0df14909f3f6422d91953d50f21b4bdedf2 (diff)
parenta14b9cb604482b5fc1ff09167cab058e1f81244b (diff)
Crashfixes for image loading
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltexturecache.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 37cc908e84..36c4f0d516 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -1928,6 +1928,12 @@ bool LLTextureCache::writeToFastCache(S32 id, LLPointer<LLImageRaw> raw, S32 dis
{
//make a duplicate to keep the original raw image untouched.
raw = raw->duplicate();
+ if (raw->isBufferInvalid())
+ {
+ LL_WARNS() << "Invalid image duplicate buffer" << LL_ENDL;
+ return false;
+ }
+
raw->scale(w, h) ;
discardlevel += i ;