liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add safeguards for setjmp calls when compiling with clang

Browse Source
This commit is contained in:
Roel Baars
2018-11-11 14:48:44 +01:00
committed by GitHub
parent 83975938ef
commit f179eb8333
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/imageio.cc
View File

@@ -447,7 +447,7 @@ void my_error_exit (j_common_ptr cinfo)
(*cinfo->err->output_message) (cinfo); (*cinfo->err->output_message) (cinfo);
/* Return control to the setjmp point */ /* Return control to the setjmp point */
#if defined( WIN32 ) && defined( __x86_64__ ) #if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
__builtin_longjmp(myerr->setjmp_buffer, 1); __builtin_longjmp(myerr->setjmp_buffer, 1);
#else #else
longjmp(myerr->setjmp_buffer, 1); longjmp(myerr->setjmp_buffer, 1);
@@ -471,7 +471,7 @@ int ImageIO::loadJPEGFromMemory (const char* buffer, int bufsize)
jerr.pub.error_exit = my_error_exit; jerr.pub.error_exit = my_error_exit;
/* Establish the setjmp return context for my_error_exit to use. */ /* Establish the setjmp return context for my_error_exit to use. */
#if defined( WIN32 ) && defined( __x86_64__ ) #if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) { if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else #else
@@ -1134,7 +1134,7 @@ int ImageIO::saveJPEG (Glib::ustring fname, int quality, int subSamp)
jerr.pub.error_exit = my_error_exit; jerr.pub.error_exit = my_error_exit;
/* Establish the setjmp return context for my_error_exit to use. */ /* Establish the setjmp return context for my_error_exit to use. */
#if defined( WIN32 ) && defined( __x86_64__ ) #if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) { if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else #else
@@ -1252,7 +1252,7 @@ int ImageIO::saveJPEG (Glib::ustring fname, int quality, int subSamp)
unsigned char *row = new unsigned char [rowlen]; unsigned char *row = new unsigned char [rowlen];
/* To avoid memory leaks we establish a new setjmp return context for my_error_exit to use. */ /* To avoid memory leaks we establish a new setjmp return context for my_error_exit to use. */
#if defined( WIN32 ) && defined( __x86_64__ ) #if defined( WIN32 ) && defined( __x86_64__ ) && !defined(__clang__)
if (__builtin_setjmp(jerr.setjmp_buffer)) { if (__builtin_setjmp(jerr.setjmp_buffer)) {
#else #else