Changeset 3165Tweet

Timestamp:

Oct 31, 2008, 4:24:27 PM (12 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added setjmp/longjmp support to jpeg loader.

File:

• libpipi/trunk/pipi/codec/modular/jpeg.c (modified) (7 diffs)

libpipi/trunk/pipi/codec/modular/jpeg.c

@@ -19 +19 @@
 
 #include "../modular.h"
+#include <setjmp.h>
 
 static int pipi_free_jpeg(pipi_image_t *img);
 
 
+
+
+struct my_error_mgr {
+    struct jpeg_error_mgr pub;
+    jmp_buf setjmp_buffer;
+};
+
+typedef struct my_error_mgr * my_error_ptr;
+
 static void format_msg(j_common_ptr cinfo, char *buf)
 {
@@ -31 +41 @@
 static void error_msg(j_common_ptr cinfo)
 {
+    my_error_ptr myerr = (my_error_ptr) cinfo->err;
     cinfo->client_data = (void*)0x1;
+    longjmp(myerr->setjmp_buffer, 1);
 }
 static void output_msg(j_common_ptr cinfo)
@@ -40 +52 @@
 {
     struct jpeg_decompress_struct cinfo;
-    struct jpeg_error_mgr jerr;
+    struct my_error_mgr jerr;
     unsigned char *image = NULL, *scanline = NULL;
     pipi_image_t *img = NULL;
@@ -48 +60 @@
     if(!fp) goto end;
 
-    /* Set callbacks */
-    cinfo.err = jpeg_std_error(&jerr);
-    jerr.error_exit = error_msg;
-    jerr.emit_message = emit_msg;
-    jerr.output_message = output_msg;
-    jerr.format_message = format_msg;
+
+    if (setjmp(jerr.setjmp_buffer)) {
+        goto end;
+    }
+    cinfo.err = jpeg_std_error(&jerr.pub);
+    jerr.pub.error_exit = error_msg;
+    jerr.pub.emit_message = emit_msg;
+    jerr.pub.output_message = output_msg;
+    jerr.pub.format_message = format_msg;
 
     /* Initialize libjpeg */
@@ -125 +140 @@
 
     struct jpeg_compress_struct cinfo;
-    struct jpeg_error_mgr jerr;
+    struct my_error_mgr jerr;
     unsigned char *data = NULL;
     unsigned char *line = NULL;
@@ -145 +160 @@
         return 0;
     }
-
-    jerr.error_exit = error_msg;
-    jerr.emit_message = emit_msg;
-    jerr.output_message = output_msg;
-
-    cinfo.err = jpeg_std_error(&(jerr));
+    
+    if (setjmp(jerr.setjmp_buffer)) {
+        goto end;
+    }
+    
+    jerr.pub.error_exit = error_msg;
+    jerr.pub.emit_message = emit_msg;
+    jerr.pub.output_message = output_msg;
+
+    cinfo.err = jpeg_std_error(&(jerr.pub));
 
     jpeg_create_compress(&cinfo);
@@ -182 +201 @@
 
     jpeg_finish_compress(&cinfo);
+end:
     jpeg_destroy_compress(&cinfo);
     free(line);