merge

1 files changed, 6 insertions, 0 deletions

diff --git a/src/png.c b/src/png.c
index c1257119..2184dd01 100644
--- a/src/png.c
+++ b/src/png.c
@@ -137,6 +137,12 @@ Png_datainfo_callback(png_structp png_ptr, png_infop info_ptr)
 
    png_get_IHDR(png_ptr, info_ptr, &png->width, &png->height,
                 &bit_depth, &color_type, &interlace_type, NULL, NULL);
+   if (abs(png->width*png->height) > IMAGE_MAX_W * IMAGE_MAX_H) {
+      MSG("Png_datainfo_callback: suspicious image size request %ldx%ld\n",
+          png->width, png->height);
+      Png_error_handling(png_ptr, "Aborting...");
+      return; /* not reached */
+   }
 
    _MSG("Png_datainfo_callback: png->width  = %ld\n"
         "Png_datainfo_callback: png->height = %ld\n",