http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28067&p=123968

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 15886f97acf5d5bc51403a19701d5ba417b813cc..e5c4c40a8ffda26dc7e83fbf19d2f54aee55bd75 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2444,6 +2444,8 @@ MagickExport MagickBooleanType SetImageExtent(Image *image,const size_t columns,
     return(MagickFalse);
   image->columns=columns;
   image->rows=rows;
+  if (image->depth > (8*sizeof(MagickSizeType)))
+    ThrowBinaryException(ImageError,"ImageDepthNotSupported",image->filename);
   return(SyncImagePixelCache(image,exception));
 }
 \f

diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h
index a1770b39d8d78d970a36652200122aea5096ecef..1755eadb2d211ad72f5faa43bb909c0bea4d53f7 100644 (file)
--- a/MagickCore/quantum-private.h
+++ b/MagickCore/quantum-private.h
@@ -271,6 +271,8 @@ static inline const unsigned char *PushShortPixel(const EndianType endian,
 static inline Quantum ScaleAnyToQuantum(const QuantumAny quantum,
   const QuantumAny range)
 {
+  if (quantum > range)
+    return(QuantumRange);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   return((Quantum) (((double) QuantumRange*quantum)/range+0.5));
 #else