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

ividsp: prevent pointers from going outside and overreading.

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-03-31 16:22:30 +02:00
parent 12038ab16d
commit f9143d2407
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/ivi_dsp.c
View File

@ -87,6 +87,13 @@ void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
} }
for (x = 0, indx = 0; x < plane->width; x+=2, indx++) { for (x = 0, indx = 0; x < plane->width; x+=2, indx++) {
if (x+2 >= plane->width) {
b0_ptr --;
b1_ptr --;
b2_ptr --;
b3_ptr --;
}
/* some values calculated in the previous iterations can */ /* some values calculated in the previous iterations can */
/* be reused in the next ones, so do appropriate copying */ /* be reused in the next ones, so do appropriate copying */
b2_1 = b2_2; // b2[x-1,y ] = b2[x, y ] b2_1 = b2_2; // b2[x-1,y ] = b2[x, y ]
@ -174,10 +181,10 @@ void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst,
back_pitch = -pitch; back_pitch = -pitch;
b0_ptr += pitch; b0_ptr += pitch + 1;
b1_ptr += pitch; b1_ptr += pitch + 1;
b2_ptr += pitch; b2_ptr += pitch + 1;
b3_ptr += pitch; b3_ptr += pitch + 1;
} }
} }