aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-03-28 11:52:52 +0100
committerReinhard Tartler <siretart@tauware.de>2013-04-06 11:39:28 +0200
commit05015d03da1d745bb92915b5cea92dec16af719f (patch)
treed3eccc6b7fd2df9e729d4790772e25d902cbf6b2
parent34ecaf6e888886badaea6470aa0e9e76595fb8fd (diff)
downloadffmpeg-05015d03da1d745bb92915b5cea92dec16af719f.tar.gz
matroska: fix a corner case in ebml-lace parsing
Make sure we notice when the lace_size[n] is a negative value. CC: libav-stable@libav.org (cherry picked from commit 8a96df7b70be509dae9ceec82d2c10a20361356d) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 86ff477d85..962493c72e 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1821,7 +1821,7 @@ static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
case 0x3: /* EBML lacing */ {
uint64_t num;
- uint32_t total;
+ uint64_t total;
n = matroska_ebmlnum_uint(matroska, data, size, &num);
if (n < 0) {
av_log(matroska->ctx, AV_LOG_INFO,