From 127bede89c57de884f17c23b19fa96601af66cd8 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sun, 8 Mar 2015 08:15:19 -0500
Subject: [PATCH] [libpng17] Reverted incorrect test on unknown chunk location.

---
 ANNOUNCE              |  6 ++----
 CHANGES               |  4 +---
 pngset.c              | 12 ------------
 tests/pngunknown-sAPI |  2 --
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 5463a98b8..849cd8eb3 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta55 - March 7, 2015
+Libpng 1.7.0beta55 - March 8, 2015
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -739,11 +739,9 @@ Version 1.7.0beta54 [March 4, 2015]
     Visual Studio (Sergey Kosarevsky)
   Merged pngwrite.c with libpng-1.6.17beta06/pngwrite.c
 
-Version 1.7.0beta55 [March 7, 2015]
+Version 1.7.0beta55 [March 8, 2015]
   Removed some comments that the configure script did not handle
     properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt.
-  Stopped a potential memory leak in png_set_unknown_chunks(). Breaks
-    tests/pngunknown-sAPI so it's temporarily marked SKIP.
   Spelling fixes ("then", "occured") reported by Lauri Nurmi.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/CHANGES b/CHANGES
index 2af835d41..7de02cd5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5029,11 +5029,9 @@ Version 1.7.0beta54 [March 4, 2015]
     Visual Studio (Sergey Kosarevsky)
   Merged pngwrite.c with libpng-1.6.17beta06/pngwrite.c
 
-Version 1.7.0beta55 [March 7, 2015]
+Version 1.7.0beta55 [March 8, 2015]
   Removed some comments that the configure script did not handle
     properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt.
-  Stopped a potential memory leak in png_set_unknown_chunks(). Breaks
-    tests/pngunknown-sAPI so it's temporarily marked SKIP.
   Spelling fixes ("then", "occured") reported by Lauri Nurmi.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/pngset.c b/pngset.c
index bd975d15b..d0b2a2281 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1213,17 +1213,6 @@ png_set_unknown_chunks(png_structrp png_ptr,
       return;
    }
 
-   if ((np->location & (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT)) == 0)
-   {
-      png_free(png_ptr, np);
-      np = NULL;
-      png_chunk_report(png_ptr,
-          "invalid chunk location in png_set_unknown_chunks",
-          PNG_CHUNK_WRITE_ERROR);
-
-      return;
-   }
-
    png_free(png_ptr, info_ptr->unknown_chunks);
    info_ptr->unknown_chunks = np; /* safe because it is initialized */
    info_ptr->free_me |= PNG_FREE_UNKN;
@@ -1302,7 +1291,6 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
 }
 #endif /* STORE_UNKNOWN_CHUNKS */
 
-
 #ifdef PNG_MNG_FEATURES_SUPPORTED
 png_uint_32 PNGAPI
 png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)
diff --git a/tests/pngunknown-sAPI b/tests/pngunknown-sAPI
index 3d759c3d4..e087ef25a 100755
--- a/tests/pngunknown-sAPI
+++ b/tests/pngunknown-sAPI
@@ -1,4 +1,2 @@
 #!/bin/sh
-code=77 # skipped
-exit 77
 exec ./pngunknown bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save "${srcdir}/pngtest.png"