From 88d4ff4b5f4c28fe38fa257b1d19b8fede4c35cc Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 20 Oct 2013 18:33:53 +0200 Subject: [PATCH] avformat/utils: Check av_packet_new_side_data() return before using it Fixes null pointer dereference Fixes CID1108592 Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 50f7d8732e..1c036aac8d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1504,8 +1504,10 @@ return_packet: st = s->streams[pkt->stream_index]; if (st->skip_samples) { uint8_t *p = av_packet_new_side_data(pkt, AV_PKT_DATA_SKIP_SAMPLES, 10); - AV_WL32(p, st->skip_samples); - av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", st->skip_samples); + if (p) { + AV_WL32(p, st->skip_samples); + av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", st->skip_samples); + } st->skip_samples = 0; }