Commit 3230590c authored by Michael Niedermayer's avatar Michael Niedermayer

libavcodec: fix side data split with 0 sized packets

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a1bb0823
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment