summaryrefslogtreecommitdiff
path: root/libavformat/nutdec.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-12-19 12:02:56 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-12-19 17:57:56 +0100
commitce10f572c12b0d172c72d31d8c979afce602bf0c (patch)
treeacca74794a52a9fae2082d306668145e23993efc /libavformat/nutdec.c
parent9d38f06d05efbb9d6196c27668eb943e934943ae (diff)
nutdec: reject negative value_len in read_sm_data
If it is negative, it can cause the byte position to move backwards in avio_skip, which in turn makes sm_size negative and thus size larger than the size of the packet buffer, causing invalid writes in avio_read. Also fix potential overflow of avio_tell(bc) + value_len. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavformat/nutdec.c')
-rw-r--r--libavformat/nutdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index ef08ad9908..4df6a57a67 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -934,7 +934,7 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int
return ret;
}
value_len = ffio_read_varlen(bc);
- if (avio_tell(bc) + value_len >= maxpos)
+ if (value_len < 0 || value_len >= maxpos - avio_tell(bc))
return AVERROR_INVALIDDATA;
if (!strcmp(name, "Palette")) {
dst = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, value_len);