[SCM] libav/experimental: break if atom size is more than size left in container atom, fix shooter.mov

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


The following commit has been merged in the experimental branch:
commit 62b6498df2ef9f5fc65d581c8be48a6ff57de1e3
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Mar 29 10:37:07 2007 +0000

    break if atom size is more than size left in container atom, fix shooter.mov
    
    Originally committed as revision 8544 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index ce8afbc..83dcdf0 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -250,7 +250,7 @@ static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
         a.size -= 8;
 
-        if(a.size < 0)
+        if(a.size < 0 || a.size > atom.size - total_size)
             break;
 
         if (c->parse_table[i].type == 0) { /* skip leaf atoms data */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list