diff options
| author | wm4 <wm4@nowhere> | 2015-01-09 01:47:48 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-01-09 01:47:48 +0100 |
| commit | a37d75d4971558a14227cabbd95abbe8d6f37f32 (patch) | |
| tree | 2fae060ec8e3c7e55d5f4847133cbea44534ce76 | |
| parent | a4c0e254a3f999ec8a3ce9f142b7b961d3d00f43 (diff) | |
| download | mpv-a37d75d4971558a14227cabbd95abbe8d6f37f32.tar.bz2 mpv-a37d75d4971558a14227cabbd95abbe8d6f37f32.tar.xz | |
tl_matroska: check chapter bounds
I have no idea what this does, but it's without doubt a sufficient fix
for the issue at hand.
Fixes #1445.
| -rw-r--r-- | player/timeline/tl_matroska.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c index 96f279c20b..f303a6fabb 100644 --- a/player/timeline/tl_matroska.c +++ b/player/timeline/tl_matroska.c @@ -360,6 +360,7 @@ static void build_timeline_loop(struct MPContext *mpctx, uint64_t *last_end_time, struct timeline_part **timeline, struct demux_chapter *chapters, + int num_chapters, int *part_count, uint64_t skip, uint64_t limit) @@ -389,6 +390,9 @@ static void build_timeline_loop(struct MPContext *mpctx, if (!demux_matroska_uid_cmp(&c->uid, &linked_m->uid)) continue; + if (i >= num_chapters) + break; // probably needed only for broken sources + if (!limit) { chapters[i].pts = *starttime / 1e9; chapters[i].name = talloc_strdup(chapters, c->name); @@ -441,7 +445,8 @@ static void build_timeline_loop(struct MPContext *mpctx, * chapters. */ build_timeline_loop(mpctx, sources, num_sources, j, starttime, missing_time, last_end_time, timeline, - chapters, part_count, c->start, c->end); + chapters, num_chapters, part_count, + c->start, c->end); // Already handled by the loop call. chapter_length = 0; } @@ -527,7 +532,7 @@ void build_ordered_chapter_timeline(struct MPContext *mpctx) int part_count = 0; build_timeline_loop(mpctx, sources, num_sources, 0, &starttime, &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. for (int n = m->num_ordered_chapters - 1; n >= 0; n--) { |