src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c

*** 27,38 ****
   * This file is available under and governed by the GNU General Public
   * License version 2 only, as published by the Free Software Foundation.
   * However, the following notice accompanied the original version of this
   * file and, per its terms, should not be removed:
   *
!  * Last changed in libpng 1.6.18 [July 23, 2015]
!  * Copyright (c) 1998-2015 Glenn Randers-Pehrson
   * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
   * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
   *
   * This code is released under the libpng license.
   * For conditions of distribution and use, see the disclaimer
--- 27,38 ----
   * This file is available under and governed by the GNU General Public
   * License version 2 only, as published by the Free Software Foundation.
   * However, the following notice accompanied the original version of this
   * file and, per its terms, should not be removed:
   *
!  * Last changed in libpng 1.6.23 [June 9, 2016]
!  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
   * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
   * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
   *
   * This code is released under the libpng license.
   * For conditions of distribution and use, see the disclaimer
*** 236,252 ****
  
        else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
            (png_ptr->mode & PNG_HAVE_PLTE) == 0)
           png_error(png_ptr, "Missing PLTE before IDAT");
  
-       png_ptr->mode |= PNG_HAVE_IDAT;
        png_ptr->process_mode = PNG_READ_IDAT_MODE;
  
        if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
           if (png_ptr->push_length == 0)
              return;
  
        if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
           png_benign_error(png_ptr, "Too many IDATs found");
     }
  
     if (chunk_name == png_IHDR)
--- 236,254 ----
  
        else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
            (png_ptr->mode & PNG_HAVE_PLTE) == 0)
           png_error(png_ptr, "Missing PLTE before IDAT");
  
        png_ptr->process_mode = PNG_READ_IDAT_MODE;
  
+       if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
           if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
              if (png_ptr->push_length == 0)
                 return;
  
+       png_ptr->mode |= PNG_HAVE_IDAT;
+ 
        if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
           png_benign_error(png_ptr, "Too many IDATs found");
     }
  
     if (chunk_name == png_IHDR)
*** 525,535 ****
--- 527,540 ----
        {
           png_free(png_ptr, old_buffer);
           png_error(png_ptr, "Insufficient memory for save_buffer");
        }
  
+       if (old_buffer)
           memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+       else if (png_ptr->save_buffer_size)
+          png_error(png_ptr, "save_buffer error");
        png_free(png_ptr, old_buffer);
        png_ptr->save_buffer_max = new_max;
     }
     if (png_ptr->current_buffer_size)
     {