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

Alexander Strasser git at videolan.org
Sat Oct 1 21:38:50 CEST 2011


ffmpeg | branch: release/0.8 | Alexander Strasser <eclipse7 at gmx.net> | Sat Sep 24 18:00:16 2011 +0200| [7aa24b157dedf39dadade9b0d59071574f6580da] | committer: Michael Niedermayer

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>
(cherry picked from commit 715f259bf949b06df1b5ed0307606dc258754c99)

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 4a2b0f0..9c7bf24 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1022,6 +1022,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;



More information about the ffmpeg-cvslog mailing list