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] Stopped a potential memory leak in png_set_unknown_chunks(). Breaks

Browse Source 
tests/pngunknown-sAPI so it's temporarily marked SKIP.
This commit is contained in:
Glenn Randers-Pehrson
2015-03-07 12:24:35 -06:00
parent ea0197a3e3
commit cc085343ec
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pngset.c
View File

@@ -1213,6 +1213,17 @@ png_set_unknown_chunks(png_structrp png_ptr,
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);
info_ptr->unknown_chunks = np; /* safe because it is initialized */
info_ptr->free_me |= PNG_FREE_UNKN;
@@ -1289,7 +1300,7 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
else if (png_ptr != NULL)
png_app_warning(png_ptr, "unknown chunk index out of range");
}
#endif
#endif /* STORE_UNKNOWN_CHUNKS */
#ifdef PNG_MNG_FEATURES_SUPPORTED