mpeg4videodec: only allow a positive length
authorAndreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Wed, 22 Apr 2015 14:32:42 +0000 (16:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 22 Apr 2015 15:40:55 +0000 (17:40 +0200)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b3408ae4c64cb674b1d5f0f30171759113ce722a)

Conflicts:

libavcodec/mpeg4videodec.c

libavcodec/mpeg4videodec.c

index 7a4a441..6d2a0ed 100644 (file)
@@ -186,13 +186,13 @@ static int mpeg4_decode_sprite_trajectory(MpegEncContext *s, GetBitContext *gb)
         int x=0, y=0;
 
         length= get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3);
-        if(length){
+        if(length > 0){
             x= get_xbits(gb, length);
         }
         if(!(s->divx_version==500 && s->divx_build==413)) skip_bits1(gb); /* marker bit */
 
         length= get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3);
-        if(length){
+        if(length > 0){
             y=get_xbits(gb, length);
         }
         skip_bits1(gb); /* marker bit */