diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-20 22:38:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-28 03:47:13 +0200 |
| commit | cff516d9e841388c3cf805dd179f7305b84050f3 (patch) | |
| tree | 84829224af0aea1992437c0e8f6e80b6297cc940 | |
| parent | 0696a555b6a516ce569bb2320b512dc790e747b4 (diff) | |
| download | ffmpeg-cff516d9e841388c3cf805dd179f7305b84050f3.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 b73cf212aa..230ddb0e5d 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -411,10 +411,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; } @@ -425,7 +427,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; |