]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 1 Mar 2013 12:35:09 +0000 (12:35 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 1 Mar 2013 12:35:09 +0000 (12:35 +0000)
coders/caption.c
coders/label.c

index 8574aaf3320fed6862fcb56791abbb8c10ddb3a4..45ce95cc3c52c7f8a9b8244291df897f0e1e51b9 100644 (file)
@@ -185,6 +185,8 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
         height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
         if ((width > image->columns) && (height > image->rows))
           break;
+        if ((width > (image->columns << 1)) || (height > (image->rows << 1)))
+          break;
       }
       high=draw_info->pointsize/2.0;
       for (low=high/2.0; (high-low) > 1.0; )
index e16ea94ffb8281e0c0261f7adfbd6ad4748991bf..fc59df6a444565753449b646f6f8eaf6c88b896a 100644 (file)
@@ -152,6 +152,8 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
         height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
         if ((width > image->columns) && (height > image->rows))
           break;
+        if ((width > (image->columns << 1)) || (height > (image->rows << 1)))
+          break;
         draw_info->pointsize*=2.0;
       }
       high=draw_info->pointsize/2.0;