From: cristy Date: Fri, 1 Mar 2013 12:35:09 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4155 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b235b2d0ea1bce8f9743d2d25bd6ddc9f72ff1d;p=imagemagick --- diff --git a/coders/caption.c b/coders/caption.c index 8574aaf33..45ce95cc3 100644 --- a/coders/caption.c +++ b/coders/caption.c @@ -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; ) diff --git a/coders/label.c b/coders/label.c index e16ea94ff..fc59df6a4 100644 --- a/coders/label.c +++ b/coders/label.c @@ -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;