From 6d3bcbb2114da4c3509dc4f6f68a9349590fb477 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 9 Jun 2013 02:29:35 +0200 Subject: [PATCH] avcodec/g2meet: check framebuf has been allocated before use Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/g2meet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 51ec5bb2e7..8eb310bd8d 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -759,7 +759,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, if (got_header) c->got_header = 1; - if (c->width && c->height) { + if (c->width && c->height && c->framebuf) { if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret;