nsxivb0b16f1
img_load_webp: close the file handler and use errno
+4 −3
1 file changed
- M image.c +4 −3
| @@ -314,9 +314,9 @@ static bool img_load_webp(img_t *img, const fileinfo_t *file) | |||
| 314 | 314 | unsigned int delay; | |
| 315 | 315 | bool err = false; | |
| 316 | 316 | ||
| 317 | − | if ((err = (webp_file = fopen(file->path, "rb")) == NULL)) { | |
| 318 | − | error(0, 0, "%s: Error opening webp image", file->name); | |
| 319 | − | goto fail; | |
| 317 | + | if ((webp_file = fopen(file->path, "rb")) == NULL) { | |
| 318 | + | error(0, errno, "%s: Error opening webp image", file->name); | |
| 319 | + | return false; | |
| 320 | 320 | } | |
| 321 | 321 | fseek(webp_file, 0L, SEEK_END); | |
| 322 | 322 | data.size = ftell(webp_file); | |
| @@ -387,6 +387,7 @@ fail: | |||
| 387 | 387 | if (dec != NULL) | |
| 388 | 388 | WebPAnimDecoderDelete(dec); | |
| 389 | 389 | free(bytes); | |
| 390 | + | fclose(webp_file); | |
| 390 | 391 | return !err; | |
| 391 | 392 | } | |
| 392 | 393 | #endif /* HAVE_LIBWEBP */ | |