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

[devel] pngvalid: add memory overwrite and palette image checks

Browse Source 
also minor cleanup in the libpng code itself (pngrtran.c and pngrutil.c) and some
extra checking there.
This commit is contained in:
John Bowler
2011-05-15 18:52:39 -05:00
committed by Glenn Randers-Pehrson
parent 593fc04096
commit 9994f25733
4 changed files with 911 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pngrutil.c
View File

@@ -2670,6 +2670,14 @@ png_combine_row(png_structp png_ptr, png_bytep row, int mask)
{
png_debug(1, "in png_combine_row");
/* Added in 1.5.3: the row_info should match the information returned by any
* call to png_read_update_info at this point. Do not continue if we got
* this wrong.
*/
if (png_ptr->info_rowbytes != 0 && png_ptr->info_rowbytes !=
PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->width))
png_error(png_ptr, "internal row size calculation error");
if (mask == 0xff)
{
png_memcpy(row, png_ptr->row_buf + 1,