diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-01-07 23:57:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 18:03:49 +0100 |
| commit | 00cde0cddc569ccd34f05ae188d47e006f16aafc (patch) | |
| tree | 613d932514bb3c11eaaca4c2446454533a4ada43 | |
| parent | b3242c0f2293e2fac8c80c3bfb444d6d20f29bb2 (diff) | |
| download | ffmpeg-00cde0cddc569ccd34f05ae188d47e006f16aafc.tar.gz | |
avcodec/dvdsubdec: error on bitmaps with size 0
Attemtping to decode them could lead to invalid writes with some fuzzed
samples.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bcaa9099b3648b47060e1724a97dc98b63c83702)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dvdsubdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 1890cdd4e6..c09c6be55a 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -97,6 +97,9 @@ static int decode_rle(uint8_t *bitmap, int linesize, int w, int h, if (start >= buf_size) return -1; + if (w <= 0 || h <= 0) + return -1; + bit_len = (buf_size - start) * 8; init_get_bits(&gb, buf + start, bit_len); |