goulash-lover
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PNG loader: Correct various error handling cases 

Under various error conditions the image width would not be set to 0
which is currently required for the loader code to behave properly.

In particular, png_read_end() should not be called in error cases.
This would cause a longjump which would exit without setting im->w to 0.
This commit is contained in:
Kim Woelders 2018-03-10 13:40:11 +01:00
parent a120e3152a
commit bb09d7844e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/loaders/loader_png.c
View File

@ -66,6 +66,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
}
if (setjmp(png_jmpbuf(png_ptr)))
{
im->w = 0;
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fclose(f);
return 0;
@ -75,16 +76,15 @@ load(ImlibImage * im, ImlibProgressFunction progress,
png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
(png_uint_32 *) (&h32), &bit_depth, &color_type,
&interlace_type, NULL, NULL);
im->w = (int)w32;
im->h = (int)h32;
if (!IMAGE_DIMENSIONS_OK(w32, h32))
{
png_read_end(png_ptr, info_ptr);
im->w = 0;
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
fclose(f);
im->w = 0;
return 0;
}
im->w = (int)w32;
im->h = (int)h32;
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
hasa = 1;
if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
@ -153,7 +153,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
if (!im->data)
{
im->w = 0;
png_read_end(png_ptr, info_ptr);
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
fclose(f);
return 0;
@ -165,7 +164,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
free(im->data);
im->data = NULL;
im->w = 0;
png_read_end(png_ptr, info_ptr);
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
fclose(f);
return 0;