[FFmpeg-cvslog] nut: Check chapter creation in decode_info_header
Andreas Cadhalpun
git at videolan.org
Sun May 10 22:17:09 CEST 2015
ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> | Tue Apr 28 20:57:59 2015 +0200| [b34257eefd98cb768ea2f53a390b8684d51e689a] | committer: Luca Barbato
nut: Check chapter creation in decode_info_header
This fixes a segmentation fault when accessing the metadata.
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
CC: libav-stable at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b34257eefd98cb768ea2f53a390b8684d51e689a
---
libavformat/nutdec.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 71eaba4..ed28107 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -487,6 +487,10 @@ static int decode_info_header(NUTContext *nut)
nut->time_base[chapter_start %
nut->time_base_count],
start, start + chapter_len, NULL);
+ if (!chapter) {
+ av_log(s, AV_LOG_ERROR, "Could not create chapter.\n");
+ return AVERROR(ENOMEM);
+ }
metadata = &chapter->metadata;
} else if (stream_id_plus1) {
st = s->streams[stream_id_plus1 - 1];
More information about the ffmpeg-cvslog
mailing list