Module: libav Branch: master Commit: 5dc47a2bd52e375ed742c45d08356b45098f458d
Author: Vittorio Giovara <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Tue Feb 3 15:40:34 2015 +0000 matroskaenc: Validate chapter start and end times CC: [email protected] Bug-Id: CID 1265717 --- libavformat/matroskaenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 458a5f6..cab43f4 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -915,14 +915,16 @@ static int mkv_write_chapters(AVFormatContext *s) for (i = 0; i < s->nb_chapters; i++) { ebml_master chapteratom, chapterdisplay; AVChapter *c = s->chapters[i]; + int chapterstart = av_rescale_q(c->start, c->time_base, scale); + int chapterend = av_rescale_q(c->end, c->time_base, scale); AVDictionaryEntry *t = NULL; + if (chapterstart < 0 || chapterstart > chapterend) + return AVERROR_INVALIDDATA; chapteratom = start_ebml_master(pb, MATROSKA_ID_CHAPTERATOM, 0); put_ebml_uint(pb, MATROSKA_ID_CHAPTERUID, c->id); - put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMESTART, - av_rescale_q(c->start, c->time_base, scale)); - put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMEEND, - av_rescale_q(c->end, c->time_base, scale)); + put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMESTART, chapterstart); + put_ebml_uint(pb, MATROSKA_ID_CHAPTERTIMEEND, chapterend); put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGHIDDEN , 0); put_ebml_uint(pb, MATROSKA_ID_CHAPTERFLAGENABLED, 1); if ((t = av_dict_get(c->metadata, "title", NULL, 0))) { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
