Commit 5fc96887 authored by Sergey Kolomenkin's avatar Sergey Kolomenkin Committed by Johann
Browse files

fix null pointer crash in Win32 because esp register is broken

https://bugs.chromium.org/p/webm/issues/detail?id=1105

Change-Id: I304ea85ea1f6474e26f074dc39dc0748b90d4d3d
parent 14ea8848
...@@ -124,7 +124,6 @@ SECTION .text ...@@ -124,7 +124,6 @@ SECTION .text
; Store bilin_filter and pw_8 location in stack ; Store bilin_filter and pw_8 location in stack
GET_GOT eax GET_GOT eax
add esp, 4 ; restore esp
lea ecx, [GLOBAL(bilin_filter_m)] lea ecx, [GLOBAL(bilin_filter_m)]
mov g_bilin_filterm, ecx mov g_bilin_filterm, ecx
...@@ -132,6 +131,7 @@ SECTION .text ...@@ -132,6 +131,7 @@ SECTION .text
lea ecx, [GLOBAL(pw_8)] lea ecx, [GLOBAL(pw_8)]
mov g_pw_8m, ecx mov g_pw_8m, ecx
RESTORE_GOT ; restore esp
LOAD_IF_USED 0, 1 ; load eax, ecx back LOAD_IF_USED 0, 1 ; load eax, ecx back
%else %else
cglobal highbd_sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, \ cglobal highbd_sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, \
...@@ -141,7 +141,6 @@ SECTION .text ...@@ -141,7 +141,6 @@ SECTION .text
; Store bilin_filter and pw_8 location in stack ; Store bilin_filter and pw_8 location in stack
GET_GOT eax GET_GOT eax
add esp, 4 ; restore esp
lea ecx, [GLOBAL(bilin_filter_m)] lea ecx, [GLOBAL(bilin_filter_m)]
mov g_bilin_filterm, ecx mov g_bilin_filterm, ecx
...@@ -149,6 +148,7 @@ SECTION .text ...@@ -149,6 +148,7 @@ SECTION .text
lea ecx, [GLOBAL(pw_8)] lea ecx, [GLOBAL(pw_8)]
mov g_pw_8m, ecx mov g_pw_8m, ecx
RESTORE_GOT ; restore esp
LOAD_IF_USED 0, 1 ; load eax, ecx back LOAD_IF_USED 0, 1 ; load eax, ecx back
%endif %endif
%else %else
......
...@@ -140,7 +140,6 @@ SECTION .text ...@@ -140,7 +140,6 @@ SECTION .text
;Store bilin_filter and pw_8 location in stack ;Store bilin_filter and pw_8 location in stack
GET_GOT eax GET_GOT eax
add esp, 4 ; restore esp
lea ecx, [GLOBAL(bilin_filter_m)] lea ecx, [GLOBAL(bilin_filter_m)]
mov g_bilin_filterm, ecx mov g_bilin_filterm, ecx
...@@ -148,6 +147,7 @@ SECTION .text ...@@ -148,6 +147,7 @@ SECTION .text
lea ecx, [GLOBAL(pw_8)] lea ecx, [GLOBAL(pw_8)]
mov g_pw_8m, ecx mov g_pw_8m, ecx
RESTORE_GOT ; restore esp
LOAD_IF_USED 0, 1 ; load eax, ecx back LOAD_IF_USED 0, 1 ; load eax, ecx back
%else %else
cglobal sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, x_offset, \ cglobal sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, x_offset, \
...@@ -157,7 +157,6 @@ SECTION .text ...@@ -157,7 +157,6 @@ SECTION .text
;Store bilin_filter and pw_8 location in stack ;Store bilin_filter and pw_8 location in stack
GET_GOT eax GET_GOT eax
add esp, 4 ; restore esp
lea ecx, [GLOBAL(bilin_filter_m)] lea ecx, [GLOBAL(bilin_filter_m)]
mov g_bilin_filterm, ecx mov g_bilin_filterm, ecx
...@@ -165,6 +164,7 @@ SECTION .text ...@@ -165,6 +164,7 @@ SECTION .text
lea ecx, [GLOBAL(pw_8)] lea ecx, [GLOBAL(pw_8)]
mov g_pw_8m, ecx mov g_pw_8m, ecx
RESTORE_GOT ; restore esp
LOAD_IF_USED 0, 1 ; load eax, ecx back LOAD_IF_USED 0, 1 ; load eax, ecx back
%endif %endif
%else %else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment