lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-01 08:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[NTDLL] Unload DLLs on loader failure

Browse Source 
This is crucial, because otherwise they linger in the loader, waiting to run their init routine, which can cause failures later.
This commit is contained in:
Timo Kreuzer
2026-05-21 13:02:52 +03:00
parent 22ee9d727f
commit 4a96f375a0
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dll/ntdll/ldr/ldrpe.c
View File

@@ -961,7 +961,7 @@ LdrpSnapThunk(IN PVOID ExportBase,
UNICODE_STRING TempUString;
ANSI_STRING ForwarderName;
PANSI_STRING ForwardName;
PVOID ForwarderHandle;
PVOID ForwarderHandle = NULL;
ULONG ForwardOrdinal;
/* Check if the snap is by ordinal */
@@ -1012,6 +1012,13 @@ LdrpSnapThunk(IN PVOID ExportBase,
if ((ULONG)Ordinal >= ExportDirectory->NumberOfFunctions)
{
FailurePath:
/* Check if we loeaded a forwarder DLL */
if (ForwarderHandle != NULL)
{
/* Unload the forwarder DLL */
LdrUnloadDll(ForwarderHandle);
}
/* Is this a static snap? */
if (Static)
{

9
dll/ntdll/ldr/ldrutils.c
View File

@@ -2378,6 +2378,15 @@ LdrpGetProcedureAddress(
Status = _SEH2_GetExceptionCode();
}
_SEH2_END;
/* Check if it succeeded */
if (!NT_SUCCESS(Status))
{
/* Failed, unload the entry */
DPRINT1("Initialization routine failed with 0x%08x\n", Status);
LdrUnloadDll(LdrEntry->DllBase);
LdrEntry = NULL;
}
}
}