diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-20 22:38:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-05-01 05:00:45 +0200 |
| commit | 9ae85f1468f41a9d56629e401c72ac7f342ca414 (patch) | |
| tree | 2bf400580999573bb91c6b41e944cf6d1533dd5b | |
| parent | 2bb9f5d6074a08c9b7c1567c463e6cc3cdf2b450 (diff) | |
| download | ffmpeg-9ae85f1468f41a9d56629e401c72ac7f342ca414.tar.gz | |
avcodec/avpacket: Fix off by 5 error
Fixes out of array read
Fixes: mozilla bug 1266129
Found-by: Tyson Smith
Tested-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9f36ea57ae6eefb42432220feab0350494f4144c)
Conflicts:
libavcodec/avpacket.c
| -rw-r--r-- | libavcodec/avpacket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 03332ac8aa..51b5c525ac 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -388,10 +388,12 @@ 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 - 5 || p - pkt->data < size) return 0; if (p[4]&128) break; + if (p - pkt->data < size + 5) + return 0; p-= size+5; } @@ -402,7 +404,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 - 5 && p - pkt->data >= size); pkt->side_data[i].data = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); pkt->side_data[i].size = size; pkt->side_data[i].type = p[4]&127; |