mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08'
* commit 'c453723ad7d14abc5e82677eebaa6025fa598f08':
gifdec: check that the image dimensions are non-zero
Conflicts:
libavcodec/gifdec.c
See: 286930d302
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8b2578ab45
@ -183,8 +183,10 @@ static int gif_read_image(GifState *s, AVFrame *frame)
|
||||
if (left + width > s->screen_width ||
|
||||
top + height > s->screen_height)
|
||||
return AVERROR_INVALIDDATA;
|
||||
if (width <= 0 || height <= 0)
|
||||
if (width <= 0 || height <= 0) {
|
||||
av_log(s->avctx, AV_LOG_ERROR, "Invalid image dimensions.\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
/* process disposal method */
|
||||
if (s->gce_prev_disposal == GCE_DISPOSAL_BACKGROUND) {
|
||||
|
Loading…
Reference in New Issue
Block a user