Second Life viewer sources 1.22.0-RC

2 files changed, 20 insertions, 3 deletions

diff --git a/linden/indra/llimagej2coj/CMakeLists.txt b/linden/indra/llimagej2coj/CMakeLists.txt
index ed3ff3c..97d22cf 100644
--- a/linden/indra/llimagej2coj/CMakeLists.txt
+++ b/linden/indra/llimagej2coj/CMakeLists.txt
@@ -29,3 +29,7 @@ set_source_files_properties(${llimagej2coj_HEADER_FILES}
 list(APPEND llimagej2coj_SOURCE_FILES ${llimagej2coj_HEADER_FILES})
 
 add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
+target_link_libraries(
+    llimagej2coj
+    ${OPENJPEG_LIBRARIES}
+    )
diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index 983241c..7a62cfd 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/indra/llimagej2coj/llimagej2coj.cpp
@@ -151,9 +151,11 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
         // dereference the array.
         if(!image || !image->numcomps)
         {
-                fprintf(stderr, "ERROR -> decodeImpl: failed to decode image!\n");
+                llwarns << "ERROR -> decodeImpl: failed to decode image!" << llendl;
                 if (image)
+                {
                         opj_image_destroy(image);
+                }
 
                 return TRUE; // done
         }
@@ -170,6 +172,17 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
                 }
         }
         
+        if(image->numcomps <= first_channel)
+        {
+                llwarns << "trying to decode more channels than are present in image: numcomps: " << image->numcomps << " first_channel: " << first_channel << llendl;
+                if (image)
+                {
+                        opj_image_destroy(image);
+                }
+                        
+                return TRUE;
+        }
+
         // Copy image data into our raw image format (instead of the separate channel format
 
         S32 img_components = image->numcomps;
@@ -211,7 +224,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
                 }
                 else // Some rare OpenJPEG versions have this bug.
                 {
-                        fprintf(stderr, "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)\n");
+                        llwarns << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << llendl;
                         opj_image_destroy(image);
 
                         return TRUE; // done
@@ -430,7 +443,7 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
 
         if(!image)
         {
-                fprintf(stderr, "ERROR -> getMetadata: failed to decode image!\n");
+                llwarns << "ERROR -> getMetadata: failed to decode image!" << llendl;
                 return FALSE;
         }