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

Fix uninitialized read in postprocessing

Browse Source 
This patch fixed WebRTC Issue 3020: "Uninit error at
vp8_mbpost_proc_down_xmm". The first 8 values in d were not initialized,
but was accessed. This patch fixed c code as well as mmx and sse2 code.

Change-Id: Iaa5b41a4ed3bea971b15fb826ce34b7ab4e36fb1
This commit is contained in:
Yunqing Wang
2014-03-24 14:54:25 -07:00
parent 35af423e8e
commit c8773416fb
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vp8/common/postproc.c
View File

@@ -303,8 +303,8 @@ void vp8_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols, i
{ {
d[r&15] = (rv2[r&127] + sum + s[0]) >> 4; d[r&15] = (rv2[r&127] + sum + s[0]) >> 4;
} }
if (r >= 8)
s[-8*pitch] = d[(r-8)&15]; s[-8*pitch] = d[(r-8)&15];
s += pitch; s += pitch;
} }
} }

7
vp8/common/x86/postproc_mmx.asm
View File

@@ -204,13 +204,16 @@ sym(vp8_mbpost_proc_down_mmx):
and rcx, 15 and rcx, 15
movd DWORD PTR [rsp+rcx*4], mm1 ;d[rcx*4] movd DWORD PTR [rsp+rcx*4], mm1 ;d[rcx*4]
cmp edx, 8
jl .skip_assignment
mov rcx, rdx mov rcx, rdx
sub rcx, 8 sub rcx, 8
and rcx, 15 and rcx, 15
movd mm1, DWORD PTR [rsp+rcx*4] ;d[rcx*4] movd mm1, DWORD PTR [rsp+rcx*4] ;d[rcx*4]
movd [rsi], mm1 movd [rsi], mm1
.skip_assignment
lea rsi, [rsi+rax] lea rsi, [rsi+rax]
lea rdi, [rdi+rax] lea rdi, [rdi+rax]

7
vp8/common/x86/postproc_sse2.asm
View File

@@ -425,13 +425,16 @@ sym(vp8_mbpost_proc_down_xmm):
and rcx, 15 and rcx, 15
movq QWORD PTR [rsp + rcx*8], xmm1 ;d[rcx*8] movq QWORD PTR [rsp + rcx*8], xmm1 ;d[rcx*8]
cmp edx, 8
jl .skip_assignment
mov rcx, rdx mov rcx, rdx
sub rcx, 8 sub rcx, 8
and rcx, 15 and rcx, 15
movq mm0, [rsp + rcx*8] ;d[rcx*8] movq mm0, [rsp + rcx*8] ;d[rcx*8]
movq [rsi], mm0 movq [rsi], mm0
.skip_assignment
lea rsi, [rsi+rax] lea rsi, [rsi+rax]
lea rdi, [rdi+rax] lea rdi, [rdi+rax]