Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 17:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Acquire the temporary buffer from non paged pool in NtQueryDirectoryObject, because the buffer is accessed at DPC_LEVEL.

Browse source 
- Do always add an empty entry at the end of the buffer

svn path=/trunk/; revision=17789
This commit is contained in:
Hartmut Birr 2005-09-10 22:35:08 +00:00
parent 829763c4d7
commit 3a292fe93d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/ntoskrnl/ob/dirobj.c
View file

@ -219,14 +219,14 @@ NtQueryDirectoryObject (IN HANDLE DirectoryHandle,
NULL); NULL);
if(NT_SUCCESS(Status)) if(NT_SUCCESS(Status))
{ {
PVOID TemporaryBuffer = ExAllocatePool(PagedPool, PVOID TemporaryBuffer = ExAllocatePool(NonPagedPool,
BufferLength); BufferLength);
if(TemporaryBuffer != NULL) if(TemporaryBuffer != NULL)
{ {
POBJECT_HEADER EntryHeader; POBJECT_HEADER EntryHeader;
PLIST_ENTRY ListEntry; PLIST_ENTRY ListEntry;
KIRQL OldLevel; KIRQL OldLevel;
ULONG RequiredSize = 0; ULONG RequiredSize = sizeof(OBJECT_DIRECTORY_INFORMATION);
ULONG nDirectories = 0; ULONG nDirectories = 0;
POBJECT_DIRECTORY_INFORMATION DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer; POBJECT_DIRECTORY_INFORMATION DirInfo = (POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer;
@ -315,10 +315,11 @@ NtQueryDirectoryObject (IN HANDLE DirectoryHandle,
if(NT_SUCCESS(Status) && nDirectories > 0) if(NT_SUCCESS(Status) && nDirectories > 0)
{ {
PWSTR strbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories); PWSTR strbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories + 1);
PWSTR deststrbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)Buffer + nDirectories); PWSTR deststrbuf = (PWSTR)((POBJECT_DIRECTORY_INFORMATION)Buffer + nDirectories + 1);
memset((POBJECT_DIRECTORY_INFORMATION)TemporaryBuffer + nDirectories, 0, sizeof(OBJECT_DIRECTORY_INFORMATION));
CopyBytes = nDirectories * sizeof(OBJECT_DIRECTORY_INFORMATION); CopyBytes = (nDirectories + 1) * sizeof(OBJECT_DIRECTORY_INFORMATION);
/* copy the names from the objects and append them to the list of the /* copy the names from the objects and append them to the list of the
objects. copy to the temporary buffer only because the directory objects. copy to the temporary buffer only because the directory