libavcodec: fix side data split with 0 sized packets
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 May 2012 18:16:35 +0000 (20:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 May 2012 18:34:32 +0000 (20:34 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avpacket.c

index a8e5c64..612f02d 100644 (file)
@@ -259,7 +259,7 @@ int av_packet_split_side_data(AVPacket *pkt){
         p = pkt->data + pkt->size - 8 - 5;
         for (i=1; ; i++){
             size = AV_RB32(p);
-            if (size>INT_MAX || p - pkt->data <= size)
+            if (size>INT_MAX || p - pkt->data < size)
                 return 0;
             if (p[4]&128)
                 break;
@@ -273,7 +273,7 @@ int av_packet_split_side_data(AVPacket *pkt){
         p= pkt->data + pkt->size - 8 - 5;
         for (i=0; ; i++){
             size= AV_RB32(p);
-            av_assert0(size<=INT_MAX && p - pkt->data > size);
+            av_assert0(size<=INT_MAX && p - pkt->data >= size);
             pkt->side_data[i].data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
             pkt->side_data[i].size = size;
             pkt->side_data[i].type = p[4]&127;