https://github.com/ImageMagick/ImageMagick/issues/4841

ImageMagick · Feb 15, 2022 · 0fec6dc · 0fec6dc
1 parent 1931a77
commit 0fec6dc
Showing 1 changed file with 16 additions and 22 deletions.
diff --git a/coders/png.c b/coders/png.c
@@ -2164,6 +2164,9 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
 
   /* To do: Read the tEXt/Creation Time chunk into the date:create property */
 
+  double
+    file_gamma;
+
   Image
     *image;
 
@@ -2173,7 +2176,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
     num_text,
     num_text_total,
     num_passes,
-    number_colors,
+    number_colors = 0,
     pass,
     ping_bit_depth = 0,
     ping_color_type = 0,
@@ -2184,9 +2187,6 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
     ping_num_trans = 0,
     unit_type = 0;
 
-  double
-    file_gamma;
-
   MagickBooleanType
     logging,
     ping_found_cHRM,
@@ -2224,8 +2224,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
     text;
 
   png_uint_32
-    ping_height,
-    ping_width,
+    ping_height = 0,
+    ping_width = 0,
     x_resolution,
     y_resolution;
 
@@ -2235,28 +2235,22 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
   Quantum
     *volatile quantum_scanline;
 
-  ssize_t
-    y;
-
-  unsigned char
-    *p;
-
-  ssize_t
-    i,
-    x;
-
   Quantum
     *q;
 
   size_t
     length,
-    ping_rowbytes,
+    ping_rowbytes = 0,
     row_offset;
 
   ssize_t
-    j;
+    i,
+    j,
+    x,
+    y;
 
   unsigned char
+    *p,
     *ping_pixels;
 
 #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
@@ -2993,7 +2987,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
   if (png_get_valid(ping,ping_info,PNG_INFO_PLTE))
     {
       png_colorp
-        palette;
+        palette = (png_colorp) NULL;
 
       (void) png_get_PLTE(ping,ping_info,&palette,&number_colors);
 
@@ -3299,7 +3293,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
       if ((int) ping_color_type == PNG_COLOR_TYPE_PALETTE)
         {
           png_colorp
-            palette;
+            palette = (png_colorp) NULL;
 
           (void) png_get_PLTE(ping,ping_info,&palette,&number_colors);
           image->colors=(size_t) number_colors;
@@ -3321,7 +3315,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
       if ((int) ping_color_type == PNG_COLOR_TYPE_PALETTE)
         {
           png_colorp
-            palette;
+            palette = (png_colorp) NULL;
 
           (void) png_get_PLTE(ping,ping_info,&palette,&number_colors);
 
@@ -4057,7 +4051,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
           if (png_get_valid(ping,ping_info,PNG_INFO_PLTE))
             {
               png_colorp
-                plte;
+                plte = (png_colorp) NULL;
 
               /*
                 Copy the PLTE to the object buffer.