diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-10-06 22:04:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-03-27 13:36:53 +0200 |
| commit | 100c16ace34d4d00d930c4379754608e139eb602 (patch) | |
| tree | a48b770ec2ba3f47369413716e1e84c81fb4e712 | |
| parent | 4249a81c31b34fc05b250c725f9ff6dfefd9dc5e (diff) | |
| download | ffmpeg-100c16ace34d4d00d930c4379754608e139eb602.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 9c2cb37f63..f652fab15a 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; |