diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-04-28 20:57:59 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2015-05-31 11:19:11 -0400 |
| commit | 3bebca9634f05ea5da7624e3a3f35ec95341e250 (patch) | |
| tree | 192f4c8a1e1f06bde0c394b6dde18ece368d30cc /libavformat | |
| parent | 1dcb68c02a55648facb82c0b2b6a1eb3dc18f988 (diff) | |
| download | ffmpeg-3bebca9634f05ea5da7624e3a3f35ec95341e250.tar.gz | |
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
(cherry picked from commit 21b21aed797b5e636adcf2df811f96a95f208930)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/nutdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 6328549d7a..0da7c4ba1d 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -474,6 +474,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]; |