Browse Source

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>
tags/n2.0
Dale Curtis Luca Barbato 13 years ago
parent
commit
fc43c19a56
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      libavformat/matroskadec.c

+ 4
- 3
libavformat/matroskadec.c View File

@@ -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,


*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,
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)


Loading…
Cancel
Save