(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 4475fda183a1ceccdbacf9f980a129df10813238..de3024b9e9530dcd9d460baf3f24102ed3bca14a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-05-21  6.7.0-0 Cristy  <quetzlzacatenango@image...>
+  * Avoid fault on corrupt JPEG images.
+
 2011-05-20  6.6.9-10 Cristy  <quetzlzacatenango@image...>
   * New version 6.6.9-10.
 

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 25e636bc1b35f4fb0f2e705e18d01a668f216f0c..714b6b804dde7db2a08c61839e95f1b5dce18cb6 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -285,19 +285,16 @@ static MagickBooleanType JPEGErrorHandler(j_common_ptr jpeg_info)
   *message='\0';
   error_manager=(ErrorManager *) jpeg_info->client_data;
   image=error_manager->image;
+  (jpeg_info->err->format_message)(jpeg_info,message);
   if (image->debug != MagickFalse)
-    {
-      /*
-        Log trace message.
-      */
-      (jpeg_info->err->format_message)(jpeg_info,message);
-      (void) LogMagickEvent(CoderEvent,GetMagickModule(),
-        "[%s] JPEG Trace: \"%s\"",image->filename,message);
-    }
+    (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+      "[%s] JPEG Trace: \"%s\"",image->filename,message);
   if (error_manager->finished != MagickFalse)
-    ThrowBinaryException(CorruptImageWarning,(char *) message,image->filename)
+    (void) ThrowMagickException(&image->exception,GetMagickModule(),
+      CorruptImageWarning,(char *) message,image->filename);
   else
-    ThrowBinaryException(CorruptImageError,(char *) message,image->filename);
+    (void) ThrowMagickException(&image->exception,GetMagickModule(),
+      CorruptImageError,(char *) message,image->filename);
   longjmp(error_manager->error_recovery,1);
 }