summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-12 01:33:35 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:07 +0900
commit22a06b0e81ab1edeaaececea1acda92cba26e33c (patch)
treec9bee6b636ca56760dc78787032f27eec63691df
parentf551da2cfb4e77fb53c41677205948d794211b2f (diff)
downloadmpv-22a06b0e81ab1edeaaececea1acda92cba26e33c.tar.bz2
mpv-22a06b0e81ab1edeaaececea1acda92cba26e33c.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 49aa4ee94b..4732dac204 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) {