From 6746cd7f61964f94f949606f839598861472dcff Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Fri, 7 Sep 2012 16:27:21 +0200 Subject: [PATCH] lavf probe: prevent codec probe with no data at all seen This occurs with fuzzed mpeg-ts files. set_codec_from_probe_data() is called with a zeroed AVProbeData since no packet made through for specific stream. --- libavformat/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index e4e4a8b445..64be7c8700 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -625,6 +625,11 @@ static void probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt) memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE); } else { st->probe_packets = 0; + if (!pd->buf_size) { + av_log(s, AV_LOG_ERROR, "nothing to probe for stream %d\n", + st->index); + return; + } } if (!st->probe_packets ||