From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Sun, 22 Apr 2018 08:48:28 +0000 (+0200)
Subject: Fixed reading out of bounds (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id... 
X-Git-Tag: 7.0.7-29~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d288ccb7b3e2b6602d1c9b7650afd0afe43f25d6;p=imagemagick

Fixed reading out of bounds (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7924).
---

diff --git a/coders/psd.c b/coders/psd.c
index dde93c7cd..1dcac026d 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -829,7 +829,7 @@ static StringInfo *ParseImageResourceBlocks(Image *image,
       }
       case 0x0421:
       {
-        if ((count > 3) && (*(p+4) == 0))
+        if ((count > 4) && (*(p+4) == 0))
           *has_merged_image=MagickFalse;
         p+=count;
         break;