From 9f25a109922da43c1f81273a431d3b40cb5a785a Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 9 Mar 2015 00:05:30 +0000 Subject: [PATCH] matroskaenc: Also validate chapter end time This prevents it to be written as unsigned. Also add an error message. CC: libav-stable@libav.org Bug-Id: CID 1265717 --- libavformat/matroskaenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 868861615f..f4d2665c2b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -920,8 +920,11 @@ static int mkv_write_chapters(AVFormatContext *s) 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) + if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) { + av_log(s, AV_LOG_ERROR, "Invalid chapter start (%d) or end (%d).\n", + chapterstart, chapterend); return AVERROR_INVALIDDATA; + } chapteratom = start_ebml_master(pb, MATROSKA_ID_CHAPTERATOM, 0); put_ebml_uint(pb, MATROSKA_ID_CHAPTERUID, c->id);