From 8fa339612681ef501a3c74db8e5845cbfffbf2b8 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Thu, 27 Mar 2014 19:15:08 +0200
Subject: [PATCH] MAINT-3827 FIXED crash in KDU texture decoding, likely out of
memory: improving stability
---
indra/llimage/llimageworker.cpp | 4 ++--
indra/llimage/tests/llimageworker_test.cpp | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp
index e425823c593..148cf4fa55f 100755
--- a/indra/llimage/llimageworker.cpp
+++ b/indra/llimage/llimageworker.cpp
@@ -143,7 +143,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
mFormattedImage->getComponents());
}
- //if (mDecodedImageRaw->getData()))
+ if (mDecodedImageRaw->getData())
{
done = mFormattedImage->decode(mDecodedImageRaw, decode_time_slice); // 1ms
mDecodedRaw = done;
@@ -159,7 +159,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
1);
}
- //if (mDecodedImageAux->getData())
+ if (mDecodedImageAux->getData())
{
done = mFormattedImage->decodeChannels(mDecodedImageAux, decode_time_slice, 4, 4); // 1ms
mDecodedAux = done;
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index e255d65b43b..f6fb8f54b48 100755
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -58,6 +58,7 @@ void LLImageBase::sanityCheck() { }
void LLImageBase::deleteData() { }
U8* LLImageBase::allocateData(S32 size) { return NULL; }
U8* LLImageBase::reallocateData(S32 size) { return NULL; }
+U8* LLImageBase::getData() { return NULL; }
LLImageRaw::LLImageRaw(U16 width, U16 height, S8 components) { }
LLImageRaw::~LLImageRaw() { }
--
GitLab