Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTDLL:LDR]

Browse source 
- Do not assume null termination of DllName and optimize extension search in LdrpLoadDll. Patch by Alexander Yastrebov (menone7 at gmail dot com).
See issue #7251 for more details.

svn path=/trunk/; revision=57092
This commit is contained in:
Thomas Faber 2012-08-18 07:56:45 +00:00
parent 3f6031fbbf
commit e812fee585
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
reactos/dll/ntdll/ldr/ldrutils.c
View file

@ -2415,37 +2415,38 @@ LdrpLoadDll(IN BOOLEAN Redirected,
{ {
PPEB Peb = NtCurrentPeb(); PPEB Peb = NtCurrentPeb();
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PWCHAR p1, p2; PWCHAR p1, p2, p1min;
WCHAR c; WCHAR c;
WCHAR NameBuffer[266]; WCHAR NameBuffer[MAX_PATH+6];
LPWSTR RawDllName; LPWSTR RawDllName;
UNICODE_STRING RawDllNameString; UNICODE_STRING RawDllNameString;
PLDR_DATA_TABLE_ENTRY LdrEntry; PLDR_DATA_TABLE_ENTRY LdrEntry;
BOOLEAN InInit = LdrpInLdrInit; BOOLEAN InInit = LdrpInLdrInit;
/* Find the name without the extension */
p1 = DllName->Buffer;
p2 = NULL;
while (*p1)
{
c = *p1++;
if (c == L'.')
{
p2 = p1;
}
else if (c == L'\\')
{
p2 = NULL;
}
}
/* Save the Raw DLL Name */ /* Save the Raw DLL Name */
RawDllName = NameBuffer; RawDllName = NameBuffer;
if (DllName->Length >= sizeof(NameBuffer)) return STATUS_NAME_TOO_LONG; if (DllName->Length >= sizeof(NameBuffer)) return STATUS_NAME_TOO_LONG;
RtlMoveMemory(RawDllName, DllName->Buffer, DllName->Length); RtlMoveMemory(RawDllName, DllName->Buffer, DllName->Length);
/* Check if no extension was found or if we got a slash */ /* Find the name without the extension */
if (!(p2) || (*p2 == '\\')) p1 = DllName->Buffer + DllName->Length / sizeof(WCHAR) - 1;
p2 = NULL;
for (p1min = DllName->Buffer; p1 >= p1min; p1--)
{
c = *p1;
if (c == L'.')
{
p2 = p1;
break;
}
else if (c == L'\\')
{
break;
}
}
/* Check if no extension was found */
if (!p2)
{ {
/* Check that we have space to add one */ /* Check that we have space to add one */
if ((DllName->Length + LdrApiDefaultExtension.Length + sizeof(UNICODE_NULL)) >= if ((DllName->Length + LdrApiDefaultExtension.Length + sizeof(UNICODE_NULL)) >=