[SCM] libav/experimental: better header_size check

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:36:16 UTC 2013


The following commit has been merged in the experimental branch:
commit 59afda9f61c8d3b23699e72939858ce25b4ed2a8
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Jan 27 21:01:47 2009 +0000

    better header_size check
    
    Originally committed as revision 16830 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index af57c6c..30d2403 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -114,7 +114,7 @@ static int fourxm_read_header(AVFormatContext *s,
     /* check for LIST-HEAD */
     GET_LIST_HEADER();
     header_size = size - 4;
-    if (fourcc_tag != HEAD_TAG || size < 4)
+    if (fourcc_tag != HEAD_TAG || header_size < 0)
         return AVERROR_INVALIDDATA;
 
     /* allocate space for the header and load the whole thing */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list