From bb7f68b27653441e4cf5176db116be94cefea585 Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 15 Feb 2017 18:46:44 -0500 Subject: [PATCH] Prevent random pixel data for corrupt JPEG image --- ChangeLog | 4 ++++ coders/jpeg.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f643197b..b9ea93c09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-02-15 7.0.4-10 Cristy + * Prevent random pixel data for corrupt JPEG image (bug report from + Hirokazu Moriguchi, Sony). + 2017-02-14 7.0.4-9 Cristy * Release ImageMagick version 7.0.4-9, GIT revision 19580:d474b37:20170214. diff --git a/coders/jpeg.c b/coders/jpeg.c index 966ec4865..c53f10817 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -359,10 +359,9 @@ 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); - ThrowBinaryException(CorruptImageWarning,(char *) message, - image->filename); + if (jpeg_info->err->num_warnings++ < JPEGExcessiveWarnings) + ThrowBinaryException(CorruptImageWarning,(char *) message, + image->filename); } else if ((image->debug != MagickFalse) && -- 2.50.1