diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-08-19 21:10:10 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-08-19 21:37:16 +0300 |
| commit | f253de24af2acb6a60a0b22d3a891e3a9d6cd2c0 (patch) | |
| tree | 3552359971ef4e78b7e0be72796bc304e96eeb9a /libmpdemux | |
| parent | 3043beffab4cb93f33720ea97a962f16dd9e16df (diff) | |
| download | mpv-f253de24af2acb6a60a0b22d3a891e3a9d6cd2c0.tar.bz2 mpv-f253de24af2acb6a60a0b22d3a891e3a9d6cd2c0.tar.xz | |
demux_mkv: remove bad mkv_free() from 0ece360eeaf9
demuxer.c calls demuxer->close() even if opening failed. Thus the
mkv_free() call added in 0ece360eeaf95f ("demux_mkv: skip files faster
in ordered chapter file search") was wrong, and could cause a crash
from a double free if some data structures were allocated before the
opening attempt was aborted.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 692bec9ecf..4da94ac99d 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1701,7 +1701,6 @@ static int demux_mkv_open(demuxer_t *demuxer) default:; int res = read_header_element(demuxer, id, 0); if (res == -2) { - mkv_free(demuxer); return 0; } else if (res < 1) goto headersdone; |