summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-12 01:33:35 +0100
committerwm4 <wm4@nowhere>2015-01-12 01:33:35 +0100
commit866a5a12b93ba6ffbe13cd73efa4baa3262a5997 (patch)
treee595cbd40acdb6f46984304c4b170a61c2bdafaf
parent2c9180f47ba28a2117312da474d14b130baf1589 (diff)
downloadmpv-866a5a12b93ba6ffbe13cd73efa4baa3262a5997.tar.bz2
mpv-866a5a12b93ba6ffbe13cd73efa4baa3262a5997.tar.xz
demux_mkv: avoid endless loop with broken files
Fixes #1457.
-rw-r--r--demux/demux_mkv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 2b93148747..ace19e1e1f 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -307,7 +307,7 @@ static bstr demux_mkv_decode(struct mp_log *log, mkv_track_t *track,
dest = NULL;
goto error;
}
- dstlen *= 2;
+ dstlen = MPMAX(1, 2 * dstlen);
}
size = dstlen - out_avail;
} else if (enc->comp_algo == 3) {