...

diff --git a/ChangeLog b/ChangeLog
index af6b8ffc36d6e1a8223f537150d83a68251c700e..4647a6e249e3886b40ce851a5b9432b5f603143e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2019-06-16  7.0.8-49 Cristy  <quetzlzacatenango@image...>
+  * Release ImageMagick version 7.0.8-50, GIT revision 15...
+
 2019-06-14  7.0.8-50 Dirk Lemstra <dirk@lem.....org>
-  * Added support for reading all images from a HEIC image (reference
+ * Added support for reading all images from a HEIC image (reference
     https://github.com/ImageMagick/ImageMagick/issues/1391).
+ * Heap-buffer-overflow in MagickCore/fourier.c (reference
+   https://github.com/ImageMagick/ImageMagick/issues/1588).
 
 2019-06-08  7.0.8-49 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-49, GIT revision 15708:6d7e1db:20190608

diff --git a/coders/bmp.c b/coders/bmp.c
index bcbb1506b63f4d1fa64ef8e1973d218a8be406da..fdabac95026ab325cc1b837491319540a6cd7ba0 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1694,6 +1694,9 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
+  if (((image->columns << 3) != (int) (image->columns << 3)) ||
+      ((image->rows << 3) != (int) (image->rows << 3)))
+    ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
   type=4;
   if (LocaleCompare(image_info->magick,"BMP2") == 0)
     type=2;

diff --git a/coders/dib.c b/coders/dib.c
index aa93c4a7adfffc8fe51c7af37614d39a4320e47c..9469015299b5fcf92aa32f4b31abae42488ec894 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -1137,6 +1137,9 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image,
   status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
   if (status == MagickFalse)
     return(status);
+  if (((image->columns << 3) != (int) (image->columns << 3)) ||
+      ((image->rows << 3) != (int) (image->rows << 3)))
+    ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
   /*
     Initialize DIB raster file header.
   */