diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-22 14:50:48 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-09-22 21:02:52 +0300 |
| commit | 23d6ba2c44540eb39c6880e4cbd527d297d264a9 (patch) | |
| tree | 1c8b06a94006d9d490d8db9dc8301117ba97ed67 /libavcodec | |
| parent | f7e616959aff8706edccdae763c24c897c449f6f (diff) | |
| download | ffmpeg-23d6ba2c44540eb39c6880e4cbd527d297d264a9.tar.gz | |
vc1dec: Check the error handling flags on slice/field header decode errors
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 602b155ecb..803c8be4b9 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6013,12 +6013,16 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, if (v->field_mode && i == n_slices1 + 2) { if ((header_ret = ff_vc1_parse_frame_header_adv(v, &s->gb)) < 0) { av_log(v->s.avctx, AV_LOG_ERROR, "Field header damaged\n"); + if (avctx->err_recognition & AV_EF_EXPLODE) + goto err; continue; } } else if (get_bits1(&s->gb)) { v->pic_header_flag = 1; if ((header_ret = ff_vc1_parse_frame_header_adv(v, &s->gb)) < 0) { av_log(v->s.avctx, AV_LOG_ERROR, "Slice header damaged\n"); + if (avctx->err_recognition & AV_EF_EXPLODE) + goto err; continue; } } |