From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 21 Dec 2017 11:42:44 +0000 (-0500)
Subject: https://github.com/ImageMagick/ImageMagick/issues/907
X-Git-Tag: 7.0.7-16~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b5d1edb02c432040e3ff894d0c461bcce6fd2c9;p=imagemagick

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

diff --git a/ChangeLog b/ChangeLog
index 3ea0108e2..fe7e286f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2017-12-18  7.0.7-16 Cristy  <quetzlzacatenango@image...>
   * Fix error reading multi-layer XCF image file.
+  * Fix possible stack overflow in WEBP reader (reference
+    https://github.com/ImageMagick/ImageMagick/issues/907)
 
 2017-12-16  7.0.7-15 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.7-15, GIT revision 21924:30cb31746:20171216.
diff --git a/coders/webp.c b/coders/webp.c
index 27fa03ba8..901338d2d 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -626,13 +626,13 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
 #if !defined(MAGICKCORE_WEBPMUX_DELEGATE)
   picture.writer=WebPEncodeWriter;
   picture.custom_ptr=(void *) image;
+#if WEBP_DECODER_ABI_VERSION >= 0x0100
+  picture.progress_hook=WebPEncodeProgress;
+#endif
 #else
   WebPMemoryWriterInit(&writer_info);
   picture.writer=WebPMemoryWrite;
   picture.custom_ptr=(&writer_info);
-#endif
-#if WEBP_DECODER_ABI_VERSION >= 0x0100
-  picture.progress_hook=WebPEncodeProgress;
 #endif
   picture.stats=(&statistics);
   picture.width=(int) image->columns;