generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/avpacket: Fix off by 5 error

Browse Source 
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
This commit is contained in:
Michael Niedermayer 2016-04-20 22:38:26 +02:00
parent 0696a555b6
commit cff516d9e8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/avpacket.c
View File

@ -411,10 +411,12 @@ int av_packet_split_side_data(AVPacket *pkt){
p = pkt->data + pkt->size - 8 - 5; p = pkt->data + pkt->size - 8 - 5;
for (i=1; ; i++){ for (i=1; ; i++){
size = AV_RB32(p); size = AV_RB32(p);
if (size>INT_MAX || p - pkt->data < size) if (size>INT_MAX - 5 || p - pkt->data < size)
return 0; return 0;
if (p[4]&128) if (p[4]&128)
break; break;
if (p - pkt->data < size + 5)
return 0;
p-= size+5; p-= size+5;
} }
@ -425,7 +427,7 @@ int av_packet_split_side_data(AVPacket *pkt){
p= pkt->data + pkt->size - 8 - 5; p= pkt->data + pkt->size - 8 - 5;
for (i=0; ; i++){ for (i=0; ; i++){
size= AV_RB32(p); 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].data = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
pkt->side_data[i].size = size; pkt->side_data[i].size = size;
pkt->side_data[i].type = p[4]&127; pkt->side_data[i].type = p[4]&127;