Merge pull request #145 from livecode/bugfix-21387

livecodepanos · web-flow · commit 53b9ca80ab6d · 2020-05-01T15:43:52.000+03:00
[[ Bug 21387 ]] Fix bug in Win32 stdcall closure trampoline
diff --git a/libffi/src/x86/win32.asm b/libffi/src/x86/win32.asm
@@ -1283,7 +1283,8 @@ ffi_closure_raw_SYSV ENDP
 
 
 ffi_closure_STDCALL PROC NEAR FORCEFRAME
-        mov  eax, [esp] ;; the ffi_closure ctx passed by the trampoline.
+		;; FORCEFRAME pushes onto the stack, so the ctx ptr is one word above
+        mov  eax, [esp + 4] ;; the ffi_closure ctx passed by the trampoline.
 
         sub  esp, 40
         lea  edx, [ebp - 24]
