diff options
| author | Kim Woelders <kim@woelders.dk> | 2018-03-10 13:40:11 +0100 |
|---|---|---|
| committer | Kim Woelders <kim@woelders.dk> | 2018-03-10 20:19:55 +0100 |
| commit | bb09d7844e5ec06f64e1e586f519c4706d94a7f6 (patch) | |
| tree | 6398ae2731b574efa5c48ee92ef351477ee5208c | |
| parent | a120e3152a5f9c5f8fadd8862d121cba9bda37be (diff) | |
| download | imlib2-bb09d7844e5ec06f64e1e586f519c4706d94a7f6.tar.gz | |
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.
| -rw-r--r-- | src/modules/loaders/loader_png.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/loaders/loader_png.c b/src/modules/loaders/loader_png.c index 7a488b5..32b669f 100644 --- a/src/modules/loaders/loader_png.c +++ b/src/modules/loaders/loader_png.c @@ -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; |