Prevents inconsistent state and null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
AVCodecContext *avctx;
int keyframe;
+ int keyframe_ok;
int trans_color; /**< color value that is used instead of transparent color */
} GifState;
}
if (s->keyframe) {
+ s->keyframe_ok = 0;
if ((ret = gif_read_header1(s)) < 0)
return ret;
s->picture.pict_type = AV_PICTURE_TYPE_I;
s->picture.key_frame = 1;
+ s->keyframe_ok = 1;
} else {
+ if (!s->keyframe_ok) {
+ av_log(avctx, AV_LOG_ERROR, "cannot decode frame without keyframe\n");
+ return AVERROR_INVALIDDATA;
+ }
+
if ((ret = avctx->reget_buffer(avctx, &s->picture)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return ret;