highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nutdec: check chapter creation in decode_info_header

Browse Source 
This fixes a segmentation fault when accessing the metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3ff1af2b0d)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2015-04-28 20:57:59 +02:00
committed by Andreas Cadhalpun
parent a13a288ec8
commit 9b87d15ca8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/nutdec.c
View File

@ -505,6 +505,10 @@ static int decode_info_header(NUTContext *nut)
nut->time_base[chapter_start % nut->time_base[chapter_start %
nut->time_base_count], nut->time_base_count],
start, start + chapter_len, NULL); start, start + chapter_len, NULL);
if (!chapter) {
av_log(s, AV_LOG_ERROR, "could not create chapter\n");
return AVERROR(ENOMEM);
}
metadata = &chapter->metadata; metadata = &chapter->metadata;
} else if (stream_id_plus1) { } else if (stream_id_plus1) {
st = s->streams[stream_id_plus1 - 1]; st = s->streams[stream_id_plus1 - 1];