[libpng16] Add tests/badcrc.png and tests/badadler.png to tests/pngtest.
Merged pngtest.c with libpng-1.7.0beta84/pngtest.c
diff --git a/ANNOUNCE b/ANNOUNCE
index 9b5b91f..3a72aa2 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.26beta01 - September 25, 2016
+Libpng 1.6.26beta01 - September 26, 2016
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.
@@ -25,7 +25,7 @@
Changes since the last public release (1.6.25):
-Version 1.6.26beta01 [September 25, 2016]
+Version 1.6.26beta01 [September 26, 2016]
Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo,
bugfix by John Bowler).
Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL
@@ -37,6 +37,9 @@
pngrutil.c.
If CRC handling of critical chunks has been set to PNG_CRC_QUIET_USE,
ignore the ADLER32 checksum in the IDAT chunk as well as the chunk CRCs.
+ Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error().
+ Add tests/badcrc.png and tests/badadler.png to tests/pngtest.
+ Merged pngtest.c with libpng-1.7.0beta84/pngtest.c
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 225d8a3..e0cf9ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5703,7 +5703,7 @@
Version 1.6.25 [September 1, 2016]
No changes.
-Version 1.6.26beta01 [September 25, 2016]
+Version 1.6.26beta01 [September 26, 2016]
Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo,
bugfix by John Bowler).
Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL
@@ -5715,6 +5715,9 @@
pngrutil.c.
If CRC handling of critical chunks has been set to PNG_CRC_QUIET_USE,
ignore the ADLER32 checksum in the IDAT chunk as well as the chunk CRCs.
+ Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error().
+ Add tests/badcrc.png and tests/badadler.png to tests/pngtest.
+ Merged pngtest.c with libpng-1.7.0beta84/pngtest.c
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/pngtest.c b/pngtest.c
index f1f688b..c7b8fcf 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * Last changed in libpng 1.6.25 [September 1, 2016]
+ * Last changed in libpng 1.7.0 [(PENDING RELEASE)]
* 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.)
@@ -43,15 +43,6 @@
#include "png.h"
-/* 1.6.1 added support for the configure test harness, which uses 77 to indicate
- * a skipped test, in earlier versions we need to succeed on a skipped test, so:
- */
-#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H)
-# define SKIP 77
-#else
-# define SKIP 0
-#endif
-
/* Known chunks that exist in pngtest.png must be supported or pngtest will fail
* simply as a result of re-ordering them. This may be fixed in 1.7
*
@@ -514,10 +505,10 @@
typedef memory_information *memory_infop;
static memory_infop pinformation = NULL;
-static png_alloc_size_t current_allocation = 0;
-static png_alloc_size_t maximum_allocation = 0;
-static png_alloc_size_t total_allocation = 0;
-static png_alloc_size_t num_allocations = 0;
+static int current_allocation = 0;
+static int maximum_allocation = 0;
+static int total_allocation = 0;
+static int num_allocations = 0;
png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr,
png_alloc_size_t size));
@@ -604,10 +595,9 @@
if (pinfo->pointer == ptr)
{
*ppinfo = pinfo->next;
- if (current_allocation < pinfo->size)
+ current_allocation -= pinfo->size;
+ if (current_allocation < 0)
fprintf(STDERR, "Duplicate free of memory\n");
- else
- current_allocation -= pinfo->size;
/* We must free the list element too, but first kill
the memory that is to be freed. */
memset(ptr, 0x55, pinfo->size);
@@ -939,12 +929,6 @@
read_user_chunk_callback);
#endif
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-# ifdef CHUNK_LIMIT /* from the build, for testing */
- png_set_chunk_malloc_max(read_ptr, CHUNK_LIMIT);
-# endif /* CHUNK_LIMIT */
-#endif
-
#ifdef PNG_SETJMP_SUPPORTED
pngtest_debug("Setting jmpbuf for read struct");
if (setjmp(png_jmpbuf(read_ptr)))
@@ -1002,9 +986,13 @@
/* Allow application (pngtest) errors and warnings to pass */
png_set_benign_errors(read_ptr, 1);
+ /* Turn off CRC and ADLER32 checking while reading */
+ png_set_crc_action(read_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
+
# ifdef PNG_WRITE_SUPPORTED
png_set_benign_errors(write_ptr, 1);
# endif
+
}
#endif /* BENIGN_ERRORS */
@@ -1404,6 +1392,11 @@
png_write_info(write_ptr, write_info_ptr);
write_chunks(write_ptr, before_IDAT); /* after PLTE */
+
+#ifdef PNG_COMPRESSION_COMPAT
+ /* Test the 'compatibility' setting here, if it is available. */
+ png_set_compression(write_ptr, PNG_COMPRESSION_COMPAT);
+#endif
#endif
#ifdef SINGLE_ROWBUF_ALLOC
@@ -1885,7 +1878,7 @@
{
int i;
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
- png_alloc_size_t allocation_now = current_allocation;
+ int allocation_now = current_allocation;
#endif
for (i=2; i<argc; ++i)
{
@@ -1918,15 +1911,15 @@
}
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
if (allocation_now != current_allocation)
- fprintf(STDERR, "MEMORY ERROR: %lu bytes lost\n",
- (unsigned long)(current_allocation - allocation_now));
+ fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+ current_allocation - allocation_now);
if (current_allocation != 0)
{
memory_infop pinfo = pinformation;
- fprintf(STDERR, "MEMORY ERROR: %lu bytes still allocated\n",
- (unsigned long)current_allocation);
+ fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+ current_allocation);
while (pinfo != NULL)
{
@@ -1939,14 +1932,14 @@
#endif
}
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
- fprintf(STDERR, " Current memory allocation: %20lu bytes\n",
- (unsigned long)current_allocation);
- fprintf(STDERR, " Maximum memory allocation: %20lu bytes\n",
- (unsigned long) maximum_allocation);
- fprintf(STDERR, " Total memory allocation: %20lu bytes\n",
- (unsigned long)total_allocation);
- fprintf(STDERR, " Number of allocations: %20lu\n",
- (unsigned long)num_allocations);
+ fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+ current_allocation);
+ fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+ maximum_allocation);
+ fprintf(STDERR, " Total memory allocation: %10d bytes\n",
+ total_allocation);
+ fprintf(STDERR, " Number of allocations: %10d\n",
+ num_allocations);
#endif
}
@@ -1957,7 +1950,7 @@
{
int kerror;
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
- png_alloc_size_t allocation_now = current_allocation;
+ int allocation_now = current_allocation;
#endif
if (i == 1)
status_dots_requested = 1;
@@ -2007,15 +2000,15 @@
}
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
if (allocation_now != current_allocation)
- fprintf(STDERR, "MEMORY ERROR: %lu bytes lost\n",
- (unsigned long)(current_allocation - allocation_now));
+ fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+ current_allocation - allocation_now);
if (current_allocation != 0)
{
memory_infop pinfo = pinformation;
- fprintf(STDERR, "MEMORY ERROR: %lu bytes still allocated\n",
- (unsigned long)current_allocation);
+ fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+ current_allocation);
while (pinfo != NULL)
{
@@ -2027,14 +2020,14 @@
#endif
}
#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
- fprintf(STDERR, " Current memory allocation: %20lu bytes\n",
- (unsigned long)current_allocation);
- fprintf(STDERR, " Maximum memory allocation: %20lu bytes\n",
- (unsigned long)maximum_allocation);
- fprintf(STDERR, " Total memory allocation: %20lu bytes\n",
- (unsigned long)total_allocation);
- fprintf(STDERR, " Number of allocations: %20lu\n",
- (unsigned long)num_allocations);
+ fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+ current_allocation);
+ fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+ maximum_allocation);
+ fprintf(STDERR, " Total memory allocation: %10d bytes\n",
+ total_allocation);
+ fprintf(STDERR, " Number of allocations: %10d\n",
+ num_allocations);
#endif
}
@@ -2085,7 +2078,7 @@
fprintf(STDERR,
" test ignored because libpng was not built with read support\n");
/* And skip this test */
- return SKIP;
+ return PNG_LIBPNG_VER < 10600 ? 0 : 77;
}
#endif
diff --git a/tests/badadler.png b/tests/badadler.png
new file mode 100644
index 0000000..2bcbcc9
--- /dev/null
+++ b/tests/badadler.png
Binary files differ
diff --git a/tests/badcrc.png b/tests/badcrc.png
new file mode 100644
index 0000000..45d0268
--- /dev/null
+++ b/tests/badcrc.png
Binary files differ
diff --git a/tests/pngtest b/tests/pngtest
index 813973b..d33f936 100755
--- a/tests/pngtest
+++ b/tests/pngtest
@@ -1,2 +1,4 @@
#!/bin/sh
+./pngtest --relaxed ${srcdir}/tests/badcrc.png
+./pngtest --relaxed ${srcdir}/tests/badadler.png
exec ./pngtest --strict ${srcdir}/pngtest.png
