Sophie

Sophie

distrib > Mageia > 6 > i586 > by-pkgid > 6b6be615f8743ce6e3523cc425763687 > files > 5

graphicsmagick-1.3.31-1.5.mga6.src.rpm

diff -r ed75df97bed3 -r 648e2b406589 coders/dib.c
--- a/coders/dib.c	Sun Dec 16 09:51:58 2018 -0600
+++ b/coders/dib.c	Sun Dec 16 18:24:04 2018 -0600
@@ -646,9 +646,11 @@
     ThrowReaderException(CorruptImageError,ImproperImageHeader,image);
   if (dib_info.colors_important > 256)
     ThrowReaderException(CorruptImageError,ImproperImageHeader,image);
+  if ((dib_info.number_colors != 0) && (dib_info.bits_per_pixel > 8))
+    ThrowReaderException(CorruptImageError,ImproperImageHeader,image);
   if ((dib_info.image_size != 0U) && (dib_info.image_size > file_size))
     ThrowReaderException(CorruptImageError,UnexpectedEndOfFile,image);
-  if ((dib_info.number_colors != 0) || (dib_info.bits_per_pixel < 16))
+  if ((dib_info.number_colors != 0) || (dib_info.bits_per_pixel <= 8))
     {
       image->storage_class=PseudoClass;
       image->colors=dib_info.number_colors;
@@ -945,7 +947,7 @@
         word;
 
       /*
-        Convert PseudoColor scanline.
+        Convert DirectColor (555 or 565) scanline.
       */
       image->storage_class=DirectClass;
       if (dib_info.compression == 1)