commit f162e01857687440049194ac14eae3302c55a88d
author cristy <urban-warrior@git.imagemagick.org> Wed Mar 28 12:54:33 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Wed Mar 28 12:54:33 2012 +0000
tree 84592d750f427b6d1a0e89c0595983486e3f3a46
parent d5daafa127fedb34021419176faf2aa2e4c3b585

coders/jpeg.c

diff --git a/coders/jpeg.c b/coders/jpeg.c
index b29a67c..c1a4137 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -330,6 +330,8 @@
 
 static MagickBooleanType JPEGWarningHandler(j_common_ptr jpeg_info,int level)
 {
+#define JPEGExcessiveWarnings  1000
+
   char
     message[JMSG_LENGTH_MAX];
 
@@ -352,11 +354,12 @@
         Process warning message.
       */
       (jpeg_info->err->format_message)(jpeg_info,message);
+      if (jpeg_info->err->num_warnings++ > JPEGExcessiveWarnings)
+        JPEGErrorHandler(jpeg_info);
       if ((jpeg_info->err->num_warnings == 0) ||
           (jpeg_info->err->trace_level >= 3))
         ThrowBinaryException(CorruptImageWarning,(char *) message,
           image->filename);
-      jpeg_info->err->num_warnings++;
     }
   else
     if ((image->debug != MagickFalse) &&

coders/tiff.c

diff --git a/coders/tiff.c b/coders/tiff.c
index 45b6d26..c7a5992 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -649,7 +649,7 @@
         ascii=(char *) NULL;
         if ((TIFFGetField(tiff,exif_info[i].tag,&ascii,&sans,&sans) != 0) &&
             (ascii != (char *) NULL) && (*ascii != '\0'))
-          (void) CopyMagickMemory(value,ascii,MaxTextExtent);
+          (void) CopyMagickString(value,ascii,MaxTextExtent);
         break;
       }
       case TIFF_SHORT: