]> granicus.if.org Git - imagemagick/commitdiff
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7122
authorCristy <urban-warrior@imagemagick.org>
Sun, 25 Mar 2018 21:39:35 +0000 (17:39 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sun, 25 Mar 2018 21:39:35 +0000 (17:39 -0400)
coders/heic.c
configure

index 79262f311ca2bb877c421cd4da496ac8cbf3309c..012496302a525ab0bd0180f9e6ad96a782c48d07 100644 (file)
@@ -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",
index b7023a642a9b789e856edf7528ff7750a6f0b44d..342eef6871c6120ca1830d7f500d31f25387c42a 100755 (executable)
--- 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