From 715f259bf949b06df1b5ed0307606dc258754c99 Mon Sep 17 00:00:00 2001 From: Alexander Strasser Date: Sat, 24 Sep 2011 18:00:16 +0200 Subject: [PATCH] h264: ff_h264_decode_extradata: check buffer args The buffer size and pointer were not checked prior to testing the first byte of the buffer. These were sometimes checked before calling, but it is better to add it inside the function as it takes buf and size arguments. Signed-off-by: Alexander Strasser --- libavcodec/h264.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ec5a46409a..1924f364b6 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -995,6 +995,9 @@ int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size) { AVCodecContext *avctx = h->s.avctx; + if(!buf || size <= 0) + return -1; + if(buf[0] == 1){ int i, cnt, nalsize; const unsigned char *p = buf;