cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devel] Reset zlib datastream after detecting oversized compressed chunk

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2010-02-12 13:55:01 -06:00
parent 9b0956fed1
commit 4748a3346e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pngrutil.c
View File

@ -240,15 +240,19 @@ png_measure_decompressed_chunk(png_structp png_ptr, int comp_type,
} }
else /* Enlarge the decompression buffer */ else /* Enlarge the decompression buffer */
{ {
text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out; text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
#ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED #ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
if (png_ptr->user_chunk_malloc_max && if (png_ptr->user_chunk_malloc_max &&
(text_size >= png_ptr->user_chunk_malloc_max - 1)) (text_size >= png_ptr->user_chunk_malloc_max - 1))
#else #else
if ((PNG_USER_CHUNK_MALLOC_MAX > 0) && if ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
text_size >= PNG_USER_CHUNK_MALLOC_MAX - 1) text_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
#endif #endif
return 0; {
inflateReset(&png_ptr->zstream);
png_ptr->zstream.avail_in = 0;
return 0;
}
} }
} }
if (ret == Z_STREAM_END) if (ret == Z_STREAM_END)