diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-20 18:33:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-20 18:33:53 +0200 |
| commit | 88d4ff4b5f4c28fe38fa257b1d19b8fede4c35cc (patch) | |
| tree | f656fc04fb5be0c254cfb401b6fc6b8f255ed65c /libavformat | |
| parent | eb5cc8febc6cd7938f8fdce95d78cacdbe1be30b (diff) | |
| download | ffmpeg-88d4ff4b5f4c28fe38fa257b1d19b8fede4c35cc.tar.gz | |
avformat/utils: Check av_packet_new_side_data() return before using it
Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files 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; } |