(no commit message)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index b29a67c8c79b0a28287b0f096e99d6e853c46406..c1a4137a83c38dd3eaff4bbe9a15fd127c199590 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -330,6 +330,8 @@ static void JPEGErrorHandler(j_common_ptr jpeg_info)
 
 static MagickBooleanType JPEGWarningHandler(j_common_ptr jpeg_info,int level)
 {
+#define JPEGExcessiveWarnings  1000
+
   char
     message[JMSG_LENGTH_MAX];
 
@@ -352,11 +354,12 @@ static MagickBooleanType JPEGWarningHandler(j_common_ptr jpeg_info,int level)
         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) &&

diff --git a/coders/tiff.c b/coders/tiff.c
index 45b6d2635bf7a9a1b10d7d9c50de8b74f95d4040..c7a599219e12f5598e9b5af7fdd8097b965037cf 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -649,7 +649,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image,
         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: