diff options
| author | Andreas Cadhalpun <[email protected]> | 2015-12-19 12:02:56 +0100 |
|---|---|---|
| committer | Andreas Cadhalpun <[email protected]> | 2015-12-20 15:40:13 +0100 |
| commit | 2db78f83bad187012f446ca43f6edcb845e7f513 (patch) | |
| tree | e78825de7131cb12eb785778e7e48cf15a32dc38 | |
| parent | 882391f9758ea13643639e21de81e3f7978b0695 (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 <[email protected]>
Signed-off-by: Andreas Cadhalpun <[email protected]>
(cherry picked from commit ce10f572c12b0d172c72d31d8c979afce602bf0c)
Signed-off-by: Andreas Cadhalpun <[email protected]>
| -rw-r--r-- | libavformat/nutdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index a28c632977..6ace90abcb 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -872,7 +872,7 @@ static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int get_str(bc, type_str, sizeof(type_str)); 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); |