RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 20:07:04 +00:00
Code Issues Projects Releases Wiki Activity

videodsp: fix 1-byte overread in top/bottom READ_NUM_BYTES iterations.

Browse Source 
This can overread (either before start or beyond end) of the buffer in
Nx1 (i.e. height=1) images.

Fixes mozilla bug 1240080.

(cherry picked from commit 0f88b3f82f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Ronald S. Bultje 2016-01-16 14:44:28 -05:00 committed by Michael Niedermayer
parent 45f5e17aa4
commit c277b24173
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/x86/videodsp.asm
View File

@ -184,14 +184,10 @@ hvar_fn
mov valb, [srcq+%2-1] mov valb, [srcq+%2-1]
%elif (%2-%%off) == 2 %elif (%2-%%off) == 2
mov valw, [srcq+%2-2] mov valw, [srcq+%2-2]
%elifidn %1, body %else
mov valb, [srcq+%2-1] mov valb, [srcq+%2-1]
sal vald, 16 ror vald, 16
mov valw, [srcq+%2-3] mov valw, [srcq+%2-3]
%elifidn %1, bottom
movd mm %+ %%mmx_idx, [srcq+%2-4]
%else ; top
movd mm %+ %%mmx_idx, [srcq+%2-3]
%endif %endif
%endif ; (%2-%%off) >= 1 %endif ; (%2-%%off) >= 1
%endmacro ; READ_NUM_BYTES %endmacro ; READ_NUM_BYTES
@ -244,18 +240,13 @@ hvar_fn
mov [dstq+%2-1], valb mov [dstq+%2-1], valb
%elif (%2-%%off) == 2 %elif (%2-%%off) == 2
mov [dstq+%2-2], valw mov [dstq+%2-2], valw
%elifidn %1, body
mov [dstq+%2-3], valw
sar vald, 16
mov [dstq+%2-1], valb
%else %else
movd vald, mm %+ %%mmx_idx
%ifidn %1, bottom
sar vald, 8
%endif
mov [dstq+%2-3], valw mov [dstq+%2-3], valw
sar vald, 16 ror vald, 16
mov [dstq+%2-1], valb mov [dstq+%2-1], valb
%ifnidn %1, body
ror vald, 16
%endif
%endif %endif
%endif ; (%2-%%off) >= 1 %endif ; (%2-%%off) >= 1
%endmacro ; WRITE_NUM_BYTES %endmacro ; WRITE_NUM_BYTES