mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng17] Reverted incorrect test on unknown chunk location.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2015-03-08 08:15:19 -05:00
parent 3e4bd8c261
commit 127bede89c
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ANNOUNCE
View File

@ -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 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. 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) Visual Studio (Sergey Kosarevsky)
Merged pngwrite.c with libpng-1.6.17beta06/pngwrite.c 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 Removed some comments that the configure script did not handle
properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. 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. Spelling fixes ("then", "occured") reported by Lauri Nurmi.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

4
CHANGES
View File

@ -5029,11 +5029,9 @@ Version 1.7.0beta54 [March 4, 2015]
Visual Studio (Sergey Kosarevsky) Visual Studio (Sergey Kosarevsky)
Merged pngwrite.c with libpng-1.6.17beta06/pngwrite.c 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 Removed some comments that the configure script did not handle
properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. 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. Spelling fixes ("then", "occured") reported by Lauri Nurmi.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

12
pngset.c
View File

@ -1213,17 +1213,6 @@ png_set_unknown_chunks(png_structrp png_ptr,
return; 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); png_free(png_ptr, info_ptr->unknown_chunks);
info_ptr->unknown_chunks = np; /* safe because it is initialized */ info_ptr->unknown_chunks = np; /* safe because it is initialized */
info_ptr->free_me |= PNG_FREE_UNKN; 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 */ #endif /* STORE_UNKNOWN_CHUNKS */
#ifdef PNG_MNG_FEATURES_SUPPORTED #ifdef PNG_MNG_FEATURES_SUPPORTED
png_uint_32 PNGAPI png_uint_32 PNGAPI
png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features) png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)

2
tests/pngunknown-sAPI
View File

@ -1,4 +1,2 @@
#!/bin/sh #!/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" exec ./pngunknown bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save "${srcdir}/pngtest.png"