highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/gifdec: truncate too big width/height for invalid gif files

Browse Source 
Fixes .
This commit is contained in:
Paul B Mahol 2018-12-10 13:32:10 +01:00
parent 14156e607d
commit 8affd753c8
1 changed files with 12 additions and 4 deletions

16
libavcodec/gifdec.c

@ -179,12 +179,20 @@ static int gif_read_image(GifState *s, AVFrame *frame)
}
/* verify that all the image is inside the screen dimensions */
if (!width || width > s->screen_width || left >= s->screen_width) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid image width.\n");
if (!width || width > s->screen_width) {
av_log(s->avctx, AV_LOG_WARNING, "Invalid image width: %d, truncating.\n", width);
width = s->screen_width;
}
if (left >= s->screen_width) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid left position: %d.\n", left);
return AVERROR_INVALIDDATA;
}
if (!height || height > s->screen_height || top >= s->screen_height) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid image height.\n");
if (!height || height > s->screen_height) {
av_log(s->avctx, AV_LOG_WARNING, "Invalid image height: %d, truncating.\n", height);
height = s->screen_height;
}
if (top >= s->screen_height) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid top position: %d.\n", top);
return AVERROR_INVALIDDATA;
}
if (left + width > s->screen_width) {