mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 20:16:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

GIF: Tolerate errors during scan if at least one frame.

Browse Source
This commit is contained in:
Michael Drake 2022-03-03 19:03:29 +00:00
parent 2e9ef8feae
commit ae9047b1ed
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
content/handlers/image/gif.c
View File

@ -37,6 +37,7 @@
#include <nsgif.h>
#include "utils/log.h"
#include "utils/utils.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
@ -211,18 +212,21 @@ static bool gif_convert(struct content *c)
/* Initialise the GIF */
gif_err = nsgif_data_scan(gif->gif, size, data);
if (gif_err != NSGIF_OK) {
err = gif__nsgif_error_to_ns(gif_err);
content_broadcast_error(c, err, nsgif_strerror(gif_err));
return false;
NSLOG(netsurf, DEBUG, "%s", nsgif_strerror(gif_err));
/* Not fatal unless er have no frames. */
}
gif_info = nsgif_get_info(gif->gif);
assert(gif_info != NULL);
/* Abort on bad GIFs */
if (gif_info->height == 0) {
if (gif_info->frame_count == 0) {
err = gif__nsgif_error_to_ns(gif_err);
content_broadcast_error(c, err, "Zero height image.");
content_broadcast_error(c, err, "GIF with no frames.");
return false;
} else if (gif_info->width == 0 || gif_info->height == 0) {
err = gif__nsgif_error_to_ns(gif_err);
content_broadcast_error(c, err, "Zero size image.");
return false;
}