diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-10-09 11:49:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-10-26 17:34:42 +0200 |
| commit | 48933f28c2a8dce024bef8110e907811b3d4c9f6 (patch) | |
| tree | b0754724e3f6ccc7dea97bf4838d9bfafc3aee8c | |
| parent | d13d3feba2d05490a83fe4dfb88125d8dfc00d63 (diff) | |
| download | ffmpeg-48933f28c2a8dce024bef8110e907811b3d4c9f6.tar.gz | |
avcodec/ffv1dec: Fix out of array read in slice counting
Fixes: test-201710.mp4
Found-by: 连一汉 <lianyihan@360.cn> and Zhibin Hu
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c20f4fcb74da2d0432c7b54499bb98f48236b904)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ffv1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 8a0a82e62b..aefa64e9b4 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -699,7 +699,7 @@ static int read_header(FFV1Context *f) } else { const uint8_t *p = c->bytestream_end; for (f->slice_count = 0; - f->slice_count < MAX_SLICES && 3 < p - c->bytestream_start; + f->slice_count < MAX_SLICES && 3 + 5*!!f->ec < p - c->bytestream_start; f->slice_count++) { int trailer = 3 + 5*!!f->ec; int size = AV_RB24(p-trailer); |