Merge branch develop into project/fonts-update

# Conflicts:
#	indra/llrender/llfontfreetype.cpp

1 files changed, 17 insertions, 2 deletions

diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp
index 0e7ec365d4..ab6c593fc2 100644
--- a/indra/llimage/llimagejpeg.cpp
+++ b/indra/llimage/llimagejpeg.cpp
@@ -31,7 +31,9 @@
 #include "llerror.h"
 #include "llexception.h"
 
+#if !LL_ARM64
 jmp_buf LLImageJPEG::sSetjmpBuffer ;
+#endif
 LLImageJPEG::LLImageJPEG(S32 quality)
 :   LLImageFormatted(IMG_CODEC_JPEG),
     mOutputBuffer( NULL ),
@@ -78,12 +80,15 @@ bool LLImageJPEG::updateData()
     //
     //try/catch will crash on Mac and Linux if LLImageJPEG::errorExit throws an error
     //so as instead, we use setjmp/longjmp to avoid this crash, which is the best we can get. --bao
+    //except in the case of AARCH64/ARM64 where setjmp will crash
     //
+#if !LL_ARM64
     if(setjmp(sSetjmpBuffer))
     {
         jpeg_destroy_decompress(&cinfo);
         return false;
     }
+#endif
     try
     {
         // Now we can initialize the JPEG decompression object.
@@ -223,11 +228,13 @@ bool LLImageJPEG::decode(LLImageRaw* raw_image, F32 decode_time)
     //try/catch will crash on Mac and Linux if LLImageJPEG::errorExit throws an error
     //so as instead, we use setjmp/longjmp to avoid this crash, which is the best we can get. --bao
     //
+#if !LL_ARM64
     if(setjmp(sSetjmpBuffer))
     {
         jpeg_destroy_decompress(&cinfo);
         return true; // done
     }
+#endif
     try
     {
         // Now we can initialize the JPEG decompression object.
@@ -431,9 +438,10 @@ void LLImageJPEG::errorExit( j_common_ptr cinfo )
 
     // Let the memory manager delete any temp files
     jpeg_destroy(cinfo);
-
+#if !LL_ARM64
     // Return control to the setjmp point
     longjmp(sSetjmpBuffer, 1) ;
+#endif
 }
 
 // Decide whether to emit a trace or warning message.
@@ -491,6 +499,12 @@ bool LLImageJPEG::encode( const LLImageRaw* raw_image, F32 encode_time )
 
     resetLastError();
 
+    if (raw_image->isBufferInvalid())
+    {
+        setLastError("Invalid input, no buffer");
+        return false;
+    }
+
     LLImageDataSharedLock lockIn(raw_image);
     LLImageDataLock lockOut(this);
 
@@ -545,6 +559,7 @@ bool LLImageJPEG::encode( const LLImageRaw* raw_image, F32 encode_time )
     //try/catch will crash on Mac and Linux if LLImageJPEG::errorExit throws an error
     //so as instead, we use setjmp/longjmp to avoid this crash, which is the best we can get. --bao
     //
+#if !LL_ARM64
     if( setjmp(sSetjmpBuffer) )
     {
         // If we get here, the JPEG code has signaled an error.
@@ -555,7 +570,7 @@ bool LLImageJPEG::encode( const LLImageRaw* raw_image, F32 encode_time )
         mOutputBufferSize = 0;
         return false;
     }
-
+#endif
     try
     {