commit 96027d919f9d385ccb01118c80a8739fda65c438
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Thu Mar 29 06:15:55 2012 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Thu Mar 29 06:38:51 2012 -0500
tree 46f1458d7e3a430fa20fa8d4fd588329bebd223b
parent 58f277c18ee262210ebb8e22df8fe130bc571177

[libpng16] Imported from libpng-1.6.0beta20.tar

pngset.c

diff --git a/pngset.c b/pngset.c
index ead9817..fb950af 100644
--- a/pngset.c
+++ b/pngset.c
@@ -722,24 +722,28 @@
     */
    if (info_ptr->num_text + num_text > info_ptr->max_text)
    {
+      int old_max_text = info_ptr->max_text;
+      int old_num_text = info_ptr->num_text;
+
       if (info_ptr->text != NULL)
       {
          png_textp old_text;
-         int old_max;
 
-         old_max = info_ptr->max_text;
          info_ptr->max_text = info_ptr->num_text + num_text + 8;
          old_text = info_ptr->text;
+
          info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
             (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
 
          if (info_ptr->text == NULL)
          {
-            png_free(png_ptr, old_text);
+            /* Restore to previous condition */
+            info_ptr->max_text = old_max_text;
+            info_ptr->text = old_text;
             return(1);
          }
 
-         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
+         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max_text *
              png_sizeof(png_text)));
          png_free(png_ptr, old_text);
       }
@@ -751,7 +755,12 @@
          info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
              (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
          if (info_ptr->text == NULL)
+         {
+            /* Restore to previous condition */
+            info_ptr->num_text = old_num_text;
+            info_ptr->max_text = old_max_text;
             return(1);
+         }
          info_ptr->free_me |= PNG_FREE_TEXT;
       }