[SCM] libav/experimental: add a check before find_frame_end call Patch by Limin Wang % lance P lmwang A gmail P com % Original thread: date: 04/09/2007 03:54 PM subject: [Ffmpeg-devel] [PATCH] fix segment fault in h264_parse if buf_size is zero

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:58:50 UTC 2013


The following commit has been merged in the experimental branch:
commit 3b77e48f0a4b6d660cd7eb14cd56f93fcb426ae2
Author: Limin Wang <lance.lmwang at gmail.com>
Date:   Wed Apr 11 14:04:47 2007 +0000

    add a check before find_frame_end call
    Patch by Limin Wang % lance P lmwang A gmail P com %
    Original thread:
    date: 04/09/2007 03:54 PM
    subject: [Ffmpeg-devel] [PATCH] fix segment fault in h264_parse if buf_size is zero
    
    Originally committed as revision 8714 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 4fcdb75..fd70b0f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -8059,7 +8059,8 @@ static int h264_parse(AVCodecParserContext *s,
             return buf_size;
         }
 
-        if(next<0){
+        if(next<0 && next != END_NOT_FOUND){
+            assert(pc->last_index + next >= 0 );
             find_frame_end(h, &pc->buffer[pc->last_index + next], -next); //update state
         }
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list