[PATCH 0/1] MR3324: ntdll: Fail loudly if RtlActivateActivationContextEx fails to allocate memory.
Many built-in callers of ActivateActCtx() just assume that it will always succeed. If it ever fails, then DeactivateActCtx() will notice that the cookie is invalid and raise an exception anyway. Based on comment https://gitlab.winehq.org/wine/wine/-/merge_requests/2068#note_37340 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3324
From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Many built-in callers of ActivateActCtx() just assume that it will always succeed. If it ever fails, then DeactivateActCtx() will notice that the cookie is invalid and raise an exception anyway. --- dlls/ntdll/actctx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 73f852f2547..853ac34d12e 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5423,9 +5423,7 @@ NTSTATUS WINAPI RtlActivateActivationContextEx( ULONG flags, TEB *teb, HANDLE ha ACTIVATION_CONTEXT_STACK *actctx_stack = teb->ActivationContextStackPointer; RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; - if (!(frame = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*frame) ))) - return STATUS_NO_MEMORY; - + frame = RtlAllocateHeap( GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(*frame) ); frame->Previous = actctx_stack->ActiveFrame; frame->ActivationContext = handle; frame->Flags = 0; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3324
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=134830 Your paranoid android. === debian11 (32 bit report) === quartz: dsoundrender: Timeout
participants (3)
-
Jinoh Kang -
Jinoh Kang (@iamahuman) -
Marvin