diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-05-03 20:10:36 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-01-04 07:43:37 +0100 |
| commit | 2d63f9b4effc062138537190d4b9201d5e51cb8d (patch) | |
| tree | c45e2aa456b06d403d6b6fd53ef8e086aea0f61a | |
| parent | 4c849c69910c6c59ba57022ef28aaf70192a0e12 (diff) | |
| download | ffmpeg-2d63f9b4effc062138537190d4b9201d5e51cb8d.tar.gz | |
dfa: add some checks to ensure that decoder won't write past frame end
(cherry picked from commit 8099187e897ddc90cb3902332c76fb2542dac308)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/dfa.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index 1cb97dc017..eeb96cf7b1 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -176,6 +176,8 @@ static int decode_dds1(uint8_t *frame, int width, int height, } else if (bitbuf & (mask << 1)) { frame += bytestream_get_le16(&src) * 2; } else { + if (frame_end - frame < width + 2) + return AVERROR_INVALIDDATA; frame[0] = frame[1] = frame[width] = frame[width + 1] = *src++; frame += 2; @@ -237,6 +239,7 @@ static int decode_wdlt(uint8_t *frame, int width, int height, const uint8_t *frame_end = frame + width * height; uint8_t *line_ptr; int count, i, v, lines, segments; + int y = 0; lines = bytestream_get_le16(&src); if (lines > height || src >= src_end) @@ -245,10 +248,12 @@ static int decode_wdlt(uint8_t *frame, int width, int height, while (lines--) { segments = bytestream_get_le16(&src); while ((segments & 0xC000) == 0xC000) { + unsigned skip_lines = -(int16_t)segments; unsigned delta = -((int16_t)segments * width); - if (frame_end - frame <= delta) + if (frame_end - frame <= delta || y + lines + skip_lines > height) return -1; frame += delta; + y += skip_lines; segments = bytestream_get_le16(&src); } if (segments & 0x8000) { @@ -257,6 +262,7 @@ static int decode_wdlt(uint8_t *frame, int width, int height, } line_ptr = frame; frame += width; + y++; while (segments--) { if (src_end - src < 2) return -1; |