RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_mkv_timeline: fix potential issue when enabling cache 

If the cache is enabled, the demuxer is closed and opened again (because
currently, the cache can not be enabled atfer data was already read).
The call for opening a new demuxer uses the same params struct, which
references the ctx->uids array. But there is a MP_TARRAY_GROW()
invocation somewhere on the way, which can reallocate the ctx->uids
array, making params.uids a dangling pointer.

This issue probably existed for a longer time, probably since 5cd33853
(slightly more obvious since f50b105d).
This commit is contained in:
wm4 2015-02-25 13:31:37 +01:00
parent 02bd54c0ac
commit 9349cfca91
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demux/demux_mkv_timeline.c
View File

@ -214,6 +214,7 @@ static bool check_file_seg(struct tl_ctx *ctx, char *filename, int segment)
{ {
free_demuxer_and_stream(d); free_demuxer_and_stream(d);
params.disable_cache = false; params.disable_cache = false;
params.matroska_wanted_uids = ctx->uids; // potentially reallocated, same data
d = demux_open_url(filename, &params, cancel, ctx->global); d = demux_open_url(filename, &params, cancel, ctx->global);
if (!d) if (!d)
continue; continue;