virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ff_emulated_edge_mc: fix integer anomalies, fix out of array reads

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-11-16 20:57:35 +01:00
parent 7750c48d30
commit 2207ea44fb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dsputil_template.c
View File

@ -131,10 +131,12 @@ void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src, int linesize, i
int start_y, start_x, end_y, end_x;
if(src_y>= h){
src+= (h-1-src_y)*linesize;
src-= src_y*linesize;
src+= (h-1)*linesize;
src_y=h-1;
}else if(src_y<=-block_h){
src+= (1-block_h-src_y)*linesize;
src-= src_y*linesize;
src+= (1-block_h)*linesize;
src_y=1-block_h;
}
if(src_x>= w){

6
libavcodec/x86/dsputil_mmx.c
View File

@ -1878,10 +1878,12 @@ static av_always_inline void emulated_edge_mc(uint8_t *buf, const uint8_t *src,
int start_y, start_x, end_y, end_x, src_y_add = 0;
if (src_y >= h) {
src_y_add = h - 1 - src_y;
src -= src_y*linesize;
src_y_add = h - 1;
src_y = h - 1;
} else if (src_y <= -block_h) {
src_y_add = 1 - block_h - src_y;
src -= src_y*linesize;
src_y_add = 1 - block_h;
src_y = 1 - block_h;
}
if (src_x >= w) {