diff options
| author | Dale Curtis <dalecurtis@chromium.org> | 2013-03-27 14:02:03 -0700 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-04-03 12:33:01 +0200 |
| commit | fc43c19a567aa945398dccb491d972c11ec2a065 (patch) | |
| tree | c6189fbfa57714bf2ab6fbd21a9ffc9228153772 /libavformat/matroskadec.c | |
| parent | 19f251a2882a8d0779b432e63bf282e4d9c443bb (diff) | |
matroska: Update the available size after lace parsing
Fix heap-buffer-overflow in matroska_parse_block for
corrupted real media in mkv files.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4a872b8dc8..2ec669f005 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1756,10 +1756,10 @@ static void matroska_clear_queue(MatroskaDemuxContext *matroska) } static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, - int size, int type, + int* buf_size, int type, uint32_t **lace_buf, int *laces) { - int res = 0, n; + int res = 0, n, size = *buf_size; uint8_t *data = *buf; uint32_t *lace_size; @@ -1857,6 +1857,7 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, *buf = data; *lace_buf = lace_size; + *buf_size = size; return res; } @@ -2051,7 +2052,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, matroska->skip_to_keyframe = 0; } - res = matroska_parse_laces(matroska, &data, size, (flags & 0x06) >> 1, + res = matroska_parse_laces(matroska, &data, &size, (flags & 0x06) >> 1, &lace_size, &laces); if (res) |