Fix wrong bit depth handling issue reported by @msmhrt (#22)

saitoha · Feb 1, 2015 · 02d4901 · 02d4901
1 parent 3b6dd3e
commit 02d4901
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/converters/loader.c b/converters/loader.c
@@ -311,6 +311,7 @@ load_png(unsigned char *buffer, int size,
 {
     chunk_t read_chunk;
     png_uint_32 bitdepth;
+    png_uint_32 palette_bitdepth;
     png_structp png_ptr;
     png_infop info_ptr;
     unsigned char **rows = NULL;
@@ -341,8 +342,8 @@ load_png(unsigned char *buffer, int size,
     }
     switch (png_get_color_type(png_ptr, info_ptr)) {
     case PNG_COLOR_TYPE_PALETTE:
-        bitdepth = png_get_PLTE(png_ptr, info_ptr, &png_palette, pncolors);
-        if (ppalette && png_palette && bitdepth == 8 && *pncolors <= reqcolors) {
+        palette_bitdepth = png_get_PLTE(png_ptr, info_ptr, &png_palette, pncolors);
+        if (ppalette && png_palette && bitdepth == 8 && palette_bitdepth == 8 && *pncolors <= reqcolors) {
             *ppalette = malloc(*pncolors * 3);
             if (*ppalette == NULL) {
                 goto cleanup;