[FFmpeg-devel] [PATCH 1/3] h264: ff_h264_decode_extradata: check buffer size

Alexander Strasser eclipse7 at gmx.net
Sat Sep 24 20:36:53 CEST 2011


  The buffer size was not checked prior to testing the first byte
of the buffer. This is sometimes checked before calling but it is
better to add it here as the function takes buf and size arguments
now anyway.
---
 libavcodec/h264.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ec5a464..6655749 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(size <= 0)
+      return -1;
+
     if(buf[0] == 1){
         int i, cnt, nalsize;
         const unsigned char *p = buf;
-- 
1.7.5.4


More information about the ffmpeg-devel mailing list