Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 08:32:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix STR #2625: removed memory leak after reading erroneous PNG data.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8656 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2011-05-12 08:07:27 +00:00
parent bcbb26d5e7
commit 622b357f24
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_PNG_Image.cxx
+13 -4
View File
@@ -123,14 +123,23 @@ void Fl_PNG_Image::load_png_(const char *name_png, const unsigned char *buffer_p
if (!from_memory) {
if ((fp = fl_fopen(name_png, "rb")) == NULL) return;
}
else name_png = "In-memory PNG data";
// Setup the PNG data structures...
pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
info = png_create_info_struct(pp);
pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (pp) info = png_create_info_struct(pp);
if (!pp || !info) {
if (pp) png_destroy_read_struct(&pp, NULL, NULL);
if (!from_memory) fclose(fp);
Fl::warning("Cannot allocate memory to read PNG file or data \"%s\".\n", name_png);
return;
}
if (setjmp(png_jmpbuf(pp)))
{
Fl::warning("PNG file \"%s\" contains errors!\n", name_png);
png_destroy_read_struct(&pp, &info, NULL);
if (!from_memory) fclose(fp);
Fl::warning("PNG file or data \"%s\" contains errors!\n", name_png);
return;
}