From 4ffbe3f3a5d9892841d9bc31d859916c2c61123f Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Tue, 9 Oct 2012 14:54:01 +0200 Subject: matroskaenc: check cue point validity before reallocation Prevents memory leak and possible access to freed memory. Fixes CID605744. --- libavformat/matroskaenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat') diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3e32943..b37d10c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -368,13 +368,13 @@ static int mkv_add_cuepoint(mkv_cues *cues, int stream, int64_t ts, int64_t clus { mkv_cuepoint *entries = cues->entries; + if (ts < 0) + return 0; + entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint)); if (entries == NULL) return AVERROR(ENOMEM); - if (ts < 0) - return 0; - entries[cues->num_entries ].pts = ts; entries[cues->num_entries ].tracknum = stream + 1; entries[cues->num_entries++].cluster_pos = cluster_pos - cues->segment_offset; -- cgit v1.1