[PATCH] Make CallProcEx32W16 clear CPEX_DEST_CDECL flag in 'nrofargs' argument before looping over arguments. The flag being set previously caused the procedure to try to loop over 2^31 + n arguments, triggering an exception.
Dirk Niggemann
dirk.niggemann at gmail.com
Tue Feb 4 16:42:50 CST 2020
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48480
Signed-off-by: Dirk Niggemann <dirk.niggemann at gmail.com>
---
dlls/krnl386.exe16/thunk.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c
index c8ad3824c0..f12766d7d9 100644
--- a/dlls/krnl386.exe16/thunk.c
+++ b/dlls/krnl386.exe16/thunk.c
@@ -2477,9 +2477,9 @@ DWORD WINAPIV CallProcEx32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32
DWORD args[32];
unsigned int i;
- TRACE("(%d,%d,%p args[",nrofargs,argconvmask,proc32);
+ TRACE("(%s,%d,%d,%p args[",nrofargs & CPEX_DEST_CDECL ? "cdecl": "stdcall",nrofargs & ~CPEX_DEST_CDECL,argconvmask,proc32);
- for (i=0;i<nrofargs;i++)
+ for (i=0;i<(nrofargs & ~CPEX_DEST_CDECL);i++)
{
if (argconvmask & (1<<i))
{
--
2.17.2 (Apple Git-113)
More information about the wine-devel
mailing list