[FFmpeg-cvslog] h264: ff_h264_decode_extradata: check buffer args

[Alexander Strasser]

ffmpeg | branch: master | Alexander Strasser <eclipse7 at gmx.net> | Sat Sep 24 18:00:16 2011 +0200| [715f259bf949b06df1b5ed0307606dc258754c99] | committer: Alexander Strasser

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 <eclipse7 at gmx.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=715f259bf949b06df1b5ed0307606dc258754c99
---

 libavcodec/h264.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ec5a464..1924f36 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;