detech invalid BMP image

2026-06-12 15:37:14 +02:00 · 2024-12-12 19:54:15 -05:00
parent 443b59e171
commit 60d1e1751b
1 changed files with 6 additions and 0 deletions
@@ -841,6 +841,12 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
            bmp_info.blue_mask=ReadBlobLSBLong(image);
            if (bmp_info.compression == BI_ALPHABITFIELDS)
              bmp_info.alpha_mask=ReadBlobLSBLong(image);
+            if ((bmp_info.size == 40) ||
+                (bmp_info.compression == BI_ALPHABITFIELDS))
+              if ((bmp_info.bits_per_pixel != 16) &&
+                  (bmp_info.bits_per_pixel != 32))
+                ThrowReaderException(CorruptImageError,
+                  "UnsupportedBitsPerPixel");
          }
        if (bmp_info.size > 40)
          {