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

[libpng16] Detect wrong libpng versions linked to pngdeflate, which currently

Browse Source 
only works with libpng versions that can be made to reliably fail when
    the deflate data contains an out-of-window reference.  This means only
    1.6 and later.
  Fixed gnu issues: g++ needs a static_cast, gcc 4.4.7 has a broken warning
    message which it is easier to work round than ignore.
This commit is contained in:
John Bowler
2013-05-08 08:56:45 -05:00
committed by Glenn Randers-Pehrson
parent 62c6fbbd29
commit 294d0b8408
5 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
contrib/tools/pngdeflate.c
View File

@@ -13,13 +13,47 @@
*/
#include <stdlib.h>
#include <stdio.h>
#ifdef PNG_READ_SUPPORTED
#include <string.h>
#include <ctype.h>
#include <png.h>
/* Define the following to use this program against your installed libpng,
* rather than the one being built here:
*/
#ifdef PNG_FREESTANDING_TESTS
# include <png.h>
#else
# include "../../png.h"
#endif
#if PNG_LIBPNG_VER < 10600 /* 1.6.0 */
# error pngdeflate will not work with libpng versions prior to 1.6
#endif
#ifdef PNG_READ_SUPPORTED
#include <zlib.h>
#ifndef PNG_MAXIMUM_INFLATE_WINDOW
# if PNG_LIBPNG_VER != 10600 && PNG_LIBPNG_VER != 10601 && \
PNG_LIBPNG_VER != 10602
# error pngdeflate not supported in this libpng version
# endif
#endif
/* Copied from pngpriv.h */
#ifdef __cplusplus
# define png_voidcast(type, value) static_cast<type>(value)
# define png_constcast(type, value) const_cast<type>(value)
# define png_aligncast(type, value) \
static_cast<type>(static_cast<void*>(value))
# define png_aligncastconst(type, value) \
static_cast<type>(static_cast<const void*>(value))
#else
# define png_voidcast(type, value) (value)
# define png_constcast(type, value) ((type)(value))
# define png_aligncast(type, value) ((void*)(value))
# define png_aligncastconst(type, value) ((const void*)(value))
#endif /* __cplusplus */
static int idat_error = 0;
static int verbose = 0;
static int errors = 0;
@@ -204,8 +238,8 @@ read_png(FILE *fp)
{
png_size_t rowbytes = png_get_rowbytes(png_ptr, info_ptr);
row = malloc(rowbytes);
display = malloc(rowbytes);
row = png_voidcast(png_byte*, malloc(rowbytes));
display = png_voidcast(png_byte*, malloc(rowbytes));
if (row == NULL || display == NULL)
png_error(png_ptr, "OOM allocating row buffers");
@@ -524,11 +558,10 @@ fix_one(FILE *fp, FILE *fpIn, IDAT_info *info, png_uint_32 max_IDAT, int strip)
{
rx(fpIn, info->header + state, 1);
wx(fp, info->header + state, 1);
++state;
++len_IDAT;
--len;
if (state == 2)
if (state++ == 1)
{
/* The zlib stream is used to validate the compressed IDAT
* data in the most relaxed way possible.