OSDN Git Service

avformat/utils: Check av_packet_new_side_data() return before using it
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Oct 2013 16:33:53 +0000 (18:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Oct 2013 16:33:53 +0000 (18:33 +0200)
Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c

index 50f7d87..1c036aa 100644 (file)
@@ -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;
     }