diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-16 20:15:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-30 17:55:31 +0100 |
| commit | 6a0e10ae0df13c27e9bf58949488460771358e76 (patch) | |
| tree | 9fe9155cca3cdc2b51d99693ebbd9fb819ceb1bf | |
| parent | 3f3e12c768124762afa52c9de51c1a9c2fd98720 (diff) | |
| download | ffmpeg-6a0e10ae0df13c27e9bf58949488460771358e76.tar.gz | |
avcodec/ffv1dec: Clear slice coordinates if they are invalid or slice header decoding fails for other reasons
Fixes Ticket4931
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4c2d4e8700cd3db59bc11ab196c0002215cf601f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ffv1dec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index b24aa0fa2a..aefdf81122 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -408,6 +408,7 @@ static int decode_slice(AVCodecContext *c, void *arg) if (ff_ffv1_init_slice_state(f, fs) < 0) return AVERROR(ENOMEM); if (decode_slice_header(f, fs) < 0) { + fs->slice_x = fs->slice_y = fs->slice_height = fs->slice_width = 0; fs->slice_damaged = 1; return AVERROR_INVALIDDATA; } |