From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 19 Aug 2018 12:09:05 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1249
X-Git-Tag: 7.0.8-11~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17a1a6f97fd088a71931bdc422f4e96bb6ffc549;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1249
---

diff --git a/coders/psd.c b/coders/psd.c
index 41456cd12..2dff0ce3e 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -790,7 +790,7 @@ static StringInfo *ParseImageResourceBlocks(Image *image,
     if (p > (blocks+length-4))
       break;
     p=PushLongPixel(MSBEndian,p,&count);
-    if ((p+count) > (blocks+length))
+    if (((p+count) < blocks) || ((p+count) > (blocks+length)))
       break;
     switch (id)
     {