diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2022-10-06 22:04:48 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-04-15 22:37:58 +0200 |
commit | 5b23daa99faba7e622db50b14d1d0c7fd1f698c1 (patch) | |
tree | 3dfa271b62d6d026231c353ad502e2b5429ad741 | |
parent | c3981b30a8badb20d81fc8b85c9fc71ca96a277c (diff) | |
download | ffmpeg-5b23daa99faba7e622db50b14d1d0c7fd1f698c1.tar.gz |
avcodec/ffv1dec: Fail earlier if prior context is corrupted
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4df91e2215a79546a7f08faa457c05182646b302)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/ffv1dec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 5a365a5e31..291e3d5d50 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -301,8 +301,11 @@ static int decode_slice(AVCodecContext *c, void *arg) } if ((ret = ff_ffv1_init_slice_state(f, fs)) < 0) return ret; - if (f->cur->key_frame || fs->slice_reset_contexts) + if (f->cur->key_frame || fs->slice_reset_contexts) { ff_ffv1_clear_slice_state(f, fs); + } else if (fs->slice_damaged) { + return AVERROR_INVALIDDATA; + } width = fs->slice_width; height = fs->slice_height; |