Commit fc43c19a authored by Dale Curtis's avatar Dale Curtis Committed by Luca Barbato

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: 's avatarLuca Barbato <lu_zero@gentoo.org>
parent 19f251a2
...@@ -1756,10 +1756,10 @@ static void matroska_clear_queue(MatroskaDemuxContext *matroska) ...@@ -1756,10 +1756,10 @@ static void matroska_clear_queue(MatroskaDemuxContext *matroska)
} }
static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, 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) uint32_t **lace_buf, int *laces)
{ {
int res = 0, n; int res = 0, n, size = *buf_size;
uint8_t *data = *buf; uint8_t *data = *buf;
uint32_t *lace_size; uint32_t *lace_size;
...@@ -1857,6 +1857,7 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf, ...@@ -1857,6 +1857,7 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
*buf = data; *buf = data;
*lace_buf = lace_size; *lace_buf = lace_size;
*buf_size = size;
return res; return res;
} }
...@@ -2051,7 +2052,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, ...@@ -2051,7 +2052,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
matroska->skip_to_keyframe = 0; 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); &lace_size, &laces);
if (res) if (res)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment