RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-27 02:40:53 +00:00
Code Issues Releases Wiki Activity

tl_matroska: check chapter bounds

Browse Source 
I have no idea what this does, but it's without doubt a sufficient fix
for the issue at hand.

Fixes #1445.

Conflicts:
	player/timeline/tl_matroska.c
This commit is contained in:
wm4 2015-01-09 01:47:48 +01:00 committed by Diogo Franco (Kovensky)
parent 35cc1830a3
commit 63e401ccc9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
player/timeline/tl_matroska.c
View File

@ -381,6 +381,7 @@ static void build_timeline_loop(struct MPContext *mpctx,
uint64_t *last_end_time, uint64_t *last_end_time,
struct timeline_part **timeline, struct timeline_part **timeline,
struct demux_chapter *chapters, struct demux_chapter *chapters,
int num_chapters,
int *part_count, int *part_count,
uint64_t skip, uint64_t skip,
uint64_t limit) uint64_t limit)
@ -418,6 +419,10 @@ static void build_timeline_loop(struct MPContext *mpctx,
* recursive ordered chapter editions? If so, more code will be * recursive ordered chapter editions? If so, more code will be
* needed to add chapters for external non-ordered segment loading * needed to add chapters for external non-ordered segment loading
* as well since that part is not recursive. */ * as well since that part is not recursive. */
if (i >= num_chapters)
break; // probably needed only for broken sources
if (!limit) { if (!limit) {
chapters[i].pts = *starttime / 1e9; chapters[i].pts = *starttime / 1e9;
chapters[i].name = talloc_strdup(chapters, c->name); chapters[i].name = talloc_strdup(chapters, c->name);
@ -477,11 +482,9 @@ static void build_timeline_loop(struct MPContext *mpctx,
} else { } else {
build_timeline_loop(mpctx, sources, num_sources, j, starttime, build_timeline_loop(mpctx, sources, num_sources, j, starttime,
missing_time, last_end_time, timeline, missing_time, last_end_time, timeline,
chapters, part_count, c->start, c->end); chapters, num_chapters, part_count,
/* The loop call has added time as needed (we can't add it here c->start, c->end);
* due to 'join_diff' in the add_timeline_part function. Since // Already handled by the loop call.
* the time has already been added as needed, the chapter has
* an effective 0 length at this point. */
chapter_length = 0; chapter_length = 0;
} }
*last_end_time = c->end; *last_end_time = c->end;
@ -571,7 +574,7 @@ void build_ordered_chapter_timeline(struct MPContext *mpctx)
int part_count = 0; int part_count = 0;
build_timeline_loop(mpctx, sources, num_sources, 0, &starttime, build_timeline_loop(mpctx, sources, num_sources, 0, &starttime,
&missing_time, &last_end_time, &timeline, &missing_time, &last_end_time, &timeline,
chapters, &part_count, 0, 0); chapters, m->num_ordered_chapters, &part_count, 0, 0);
// Fuck everything (2): filter out all "unset" chapters. // Fuck everything (2): filter out all "unset" chapters.
for (int n = m->num_ordered_chapters - 1; n >= 0; n--) { for (int n = m->num_ordered_chapters - 1; n >= 0; n--) {