From de2fabcf3d7ea45b51225cad7a0381eadf90d14e Mon Sep 17 00:00:00 2001 From: "Karl Stiefvater (qarl)" Date: Mon, 8 Feb 2010 13:13:16 -0600 Subject: EXT-4929 Crash in llimage.cpp EXT-4713 Hook attachment from loco pocos pirate outfit causes viewer crash removed broken assert (all cases are covered by asserts downstream.) reviewed by James. --- indra/llimage/llimage.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/llimage') diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index e02be6c8c1..5649b4cab7 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -676,9 +676,6 @@ void LLImageRaw::copy(LLImageRaw* src) LLImageRaw* dst = this; // Just for clarity. - llassert( (3 == src->getComponents()) || (4 == src->getComponents()) ); - llassert( (3 == dst->getComponents()) || (4 == dst->getComponents()) ); - if( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) ) { // No scaling needed -- cgit v1.2.3 From 9fee359d1baf6e0046655cb8e4afabb8774754b1 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Sat, 13 Feb 2010 14:37:48 +0000 Subject: CID-3 Checker: CHECKED_RETURN Function: LLImageDecodeThread::update(unsigned int) File: /indra/llimage/llimageworker.cpp --- indra/llimage/llimageworker.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'indra/llimage') diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index 86d41515e7..20a72d0a28 100644 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -54,9 +54,14 @@ S32 LLImageDecodeThread::update(U32 max_time_ms) { creation_info& info = *iter; ImageRequest* req = new ImageRequest(info.handle, info.image, - info.priority, info.discard, info.needs_aux, - info.responder); - addRequest(req); + info.priority, info.discard, info.needs_aux, + info.responder); + + bool res = addRequest(req); + if (!res) + { + llerrs << "request added after LLLFSThread::cleanupClass()" << llendl; + } } mCreationList.clear(); S32 res = LLQueuedThread::update(max_time_ms); -- cgit v1.2.3