Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 23:45:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LDR] Check forwarded imports against the manifest before trying to load them

Browse source 
CORE-15729
This commit is contained in:
Mark Jansen 2019-02-07 20:57:04 +01:00
parent d9c4d28e59
commit 27cc4c6a08
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

37
dll/ntdll/ldr/ldrpe.c
View file

@ -1133,13 +1133,44 @@ FailurePath:
/* Make sure the conversion was OK */ /* Make sure the conversion was OK */
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
/* Load the forwarder, free the temp string */ WCHAR StringBuffer[MAX_PATH];
Status = LdrpLoadDll(FALSE, UNICODE_STRING StaticString, *RedirectedImportName;
BOOLEAN Redirected = FALSE;
RtlInitEmptyUnicodeString(&StaticString, StringBuffer, sizeof(StringBuffer));
/* Check if the SxS Assemblies specify another file */
Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE,
&TempUString,
&LdrApiDefaultExtension,
&StaticString,
NULL,
&RedirectedImportName,
NULL,
NULL,
NULL);
if (NT_SUCCESS(Status))
{
if (ShowSnaps)
{
DPRINT1("LDR: %Z got redirected to %wZ\n", &ForwarderName, RedirectedImportName);
}
/* Let Ldrp know */
Redirected = TRUE;
}
else
{
RedirectedImportName = &TempUString;
}
/* Load the forwarder */
Status = LdrpLoadDll(Redirected,
NULL, NULL,
NULL, NULL,
&TempUString, RedirectedImportName,
&ForwarderHandle, &ForwarderHandle,
FALSE); FALSE);
RtlFreeUnicodeString(&TempUString); RtlFreeUnicodeString(&TempUString);
} }