From: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Date: Tue, 28 Apr 2015 18:57:59 +0000 (+0200)
Subject: nut: Check chapter creation in decode_info_header
X-Git-Tag: v11.4~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21b21aed797b5e636adcf2df811f96a95f208930;p=platform%2Fupstream%2Flibav.git

nut: Check chapter creation in decode_info_header

This fixes a segmentation fault when accessing the metadata.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org
---

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 36ca754..116c3d4 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -482,6 +482,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];