From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 25 Mar 2018 21:39:35 +0000 (-0400)
Subject: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7122
X-Git-Tag: 7.0.7-29~306
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b81a67cfe56c8deb1c346e347aa3f2b8de23a061;p=imagemagick

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7122
---

diff --git a/coders/heic.c b/coders/heic.c
index 79262f311..012496302 100644
--- a/coders/heic.c
+++ b/coders/heic.c
@@ -448,6 +448,8 @@ static MagickBooleanType ParseIinfAtom(Image *image, DataBuffer *db,
      item indicies starts from 1
   */
   ctx->idsCount = count;
+  if (ctx.itemInfo != (HEICItemInfo *) NULL)
+    ctx.itemInfo=(HEICItemInfo *) RelinquishMagickMemory(ctx.itemInfo);
   ctx->itemInfo = (HEICItemInfo *)AcquireMagickMemory(sizeof(HEICItemInfo)*(count+1));
   if (ctx->itemInfo == (HEICItemInfo *) NULL)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
diff --git a/configure b/configure
index b7023a642..342eef687 100755
--- a/configure
+++ b/configure
@@ -4550,7 +4550,7 @@ MAGICK_PATCHLEVEL_VERSION=28
 
 MAGICK_VERSION=7.0.7-28
 
-MAGICK_GIT_REVISION=23549:7039ddcbd:20180324
+MAGICK_GIT_REVISION=23617:486c5d481:20180325
 
 
 # Substitute library versioning