Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use the given buffer for getting the name of the parent.

Browse source 
- Check the length of the buffer.  
- Intialise the name string if it is necessary.

svn path=/trunk/; revision=18030
This commit is contained in:
Hartmut Birr 2005-09-24 18:28:04 +00:00
parent 2914b8925b
commit 262c303ffb
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
reactos/ntoskrnl/cm/regobj.c
View file

@ -490,49 +490,49 @@ CmiObjectQueryName (PVOID ObjectBody,
ULONG Length,
PULONG ReturnLength)
{
POBJECT_NAME_INFORMATION LocalInfo;
PKEY_OBJECT KeyObject;
ULONG LocalReturnLength;
NTSTATUS Status;
DPRINT ("CmiObjectQueryName() called\n");
KeyObject = (PKEY_OBJECT)ObjectBody;
LocalInfo = ExAllocatePool (NonPagedPool,
sizeof(OBJECT_NAME_INFORMATION) +
MAX_PATH * sizeof(WCHAR));
if (LocalInfo == NULL)
return STATUS_INSUFFICIENT_RESOURCES;
if (KeyObject->ParentKey != KeyObject)
{
Status = ObQueryNameString (KeyObject->ParentKey,
LocalInfo,
MAX_PATH * sizeof(WCHAR),
&LocalReturnLength);
ObjectNameInfo,
Length,
ReturnLength);
}
else
{
/* KeyObject is the root key */
Status = ObQueryNameString (HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(KeyObject))->Directory,
LocalInfo,
MAX_PATH * sizeof(WCHAR),
&LocalReturnLength);
ObjectNameInfo,
Length,
ReturnLength);
}
if (!NT_SUCCESS (Status))
if (!NT_SUCCESS(Status) && Status != STATUS_INFO_LENGTH_MISMATCH)
{
ExFreePool (LocalInfo);
return Status;
}
DPRINT ("Parent path: %wZ\n", &LocalInfo->Name);
(*ReturnLength) += sizeof(WCHAR) + KeyObject->Name.Length;
Status = RtlAppendUnicodeStringToString (&ObjectNameInfo->Name,
&LocalInfo->Name);
ExFreePool (LocalInfo);
if (!NT_SUCCESS (Status))
return Status;
if (Status == STATUS_INFO_LENGTH_MISMATCH || *ReturnLength > Length)
{
return STATUS_INFO_LENGTH_MISMATCH;
}
if (ObjectNameInfo->Name.Buffer == NULL)
{
ObjectNameInfo->Name.Buffer = (PWCHAR)(ObjectNameInfo + 1);
ObjectNameInfo->Name.Length = 0;
ObjectNameInfo->Name.MaximumLength = Length - sizeof(OBJECT_NAME_INFORMATION);
}
DPRINT ("Parent path: %wZ\n", ObjectNameInfo->Name);
Status = RtlAppendUnicodeToString (&ObjectNameInfo->Name,
L"\\");