743f9fc86f
- fixes some minor CVEs - drop python-vc2013.patch.1 - drop python-3.3.3-py17797.patch.1: the bug was fixed in MSVC2015 runtime so not relevant - drop python-lsan.patch.0: fixed upstream - ubsan.patch.0: drop hunks that were fixed upstream - python-3.5.0-tcltk.disable.patch: merge into msvc-disable.patch.1 Change-Id: I2aecae446539d28eaf3eb64ee67581596019335d Reviewed-on: https://gerrit.libreoffice.org/33225 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
43 lines
1.9 KiB
Plaintext
43 lines
1.9 KiB
Plaintext
--- Modules/_ctypes/libffi/src/x86/ffi64.c
|
|
+++ Modules/_ctypes/libffi/src/x86/ffi64.c
|
|
@@ -548,11 +548,15 @@
|
|
tramp = (volatile unsigned short *) &closure->tramp[0];
|
|
|
|
tramp[0] = 0xbb49; /* mov <code>, %r11 */
|
|
- *((unsigned long long * volatile) &tramp[1])
|
|
- = (unsigned long) ffi_closure_unix64;
|
|
+ tramp[1] = (unsigned long) ffi_closure_unix64;
|
|
+ tramp[2] = ((unsigned long) ffi_closure_unix64) >> 16;
|
|
+ tramp[3] = ((unsigned long) ffi_closure_unix64) >> 32;
|
|
+ tramp[4] = ((unsigned long) ffi_closure_unix64) >> 48;
|
|
tramp[5] = 0xba49; /* mov <data>, %r10 */
|
|
- *((unsigned long long * volatile) &tramp[6])
|
|
- = (unsigned long) codeloc;
|
|
+ tramp[6] = (unsigned long) codeloc;
|
|
+ tramp[7] = ((unsigned long) codeloc) >> 16;
|
|
+ tramp[8] = ((unsigned long) codeloc) >> 32;
|
|
+ tramp[9] = ((unsigned long) codeloc) >> 48;
|
|
|
|
/* Set the carry bit iff the function uses any sse registers.
|
|
This is clc or stc, together with the first byte of the jmp. */
|
|
--- Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
|
|
+++ Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
|
|
@@ -599,9 +599,15 @@
|
|
tramp = (volatile unsigned short*)&closure->tramp[0];
|
|
|
|
tramp[0] = 0xbb49; /* mov <code>, %r11 */
|
|
- *(void* volatile*)&tramp[1] = ffi_closure_unix64;
|
|
+ tramp[1] = (unsigned short) ffi_closure_unix64;
|
|
+ tramp[2] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 16);
|
|
+ tramp[3] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 32);
|
|
+ tramp[4] = (unsigned short) (((unsigned long)ffi_closure_unix64) >> 48);
|
|
tramp[5] = 0xba49; /* mov <data>, %r10 */
|
|
- *(void* volatile*)&tramp[6] = closure;
|
|
+ tramp[6] = (unsigned short) closure;
|
|
+ tramp[7] = (unsigned short) (((unsigned long)closure) >> 16);
|
|
+ tramp[8] = (unsigned short) (((unsigned long)closure) >> 32);
|
|
+ tramp[9] = (unsigned short) (((unsigned long)closure) >> 48);
|
|
|
|
/* Set the carry bit if the function uses any sse registers.
|
|
This is clc or stc, together with the first byte of the jmp. */
|