From af9ec3dd1d9e90ec8134b01074b7beb01a1beb1a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 13 Nov 2012 22:20:44 +0100 Subject: [PATCH] av_probe_input_format3: support NULL as buffer. Fixes null ptr deref Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 0240b0c3b5..4072ac8a8e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -295,6 +295,10 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score AVProbeData lpd = *pd; AVInputFormat *fmt1 = NULL, *fmt; int score, nodat = 0, score_max=0; + const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE]; + + if (!lpd.buf) + lpd.buf = zerobuffer; if (lpd.buf_size > 10 && ff_id3v2_match(lpd.buf, ID3v2_DEFAULT_MAGIC)) { int id3len = ff_id3v2_tag_len(lpd.buf);