--- old/src/java.desktop/share/native/libsplashscreen/splashscreen_png.c	2015-05-19 12:46:08.556728696 +0200
+++ new/src/java.desktop/share/native/libsplashscreen/splashscreen_png.c	2015-05-19 12:46:08.507728572 +0200
@@ -48,8 +48,8 @@
     int stride;
     ImageFormat srcFormat;
     png_uint_32 i, rowbytes;
-    png_bytepp row_pointers = NULL;
-    png_bytep image_data = NULL;
+    png_bytepp row_pointers;
+    png_bytep image_data;
     int success = 0;
     double gamma;
 
@@ -63,11 +63,15 @@
 
     png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
     if (!png_ptr) {
+        row_pointers = NULL;
+        image_data = NULL;
         goto done;
     }
 
     info_ptr = png_create_info_struct(png_ptr);
     if (!info_ptr) {
+        row_pointers = NULL;
+        image_data = NULL;
         goto done;
     }
 
@@ -77,9 +81,14 @@
 #else
     if (setjmp(png_jmpbuf(png_ptr))) {
 #endif
+        row_pointers = NULL;
+        image_data = NULL;
         goto done;
     }
 
+    row_pointers = NULL;
+    image_data = NULL;
+
     png_set_read_fn(png_ptr, io_ptr, read_func);
 
     png_set_sig_bytes(png_ptr, SIG_BYTES);      /* we already read the 8 signature bytes */