Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 20:03:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed ProbeAndCaptureUnicodeString to properly capture unicode strings

Browse source 
svn path=/trunk/; revision=18815
This commit is contained in:
Thomas Bluemel 2005-10-27 23:24:15 +00:00
parent 87f4485a9f
commit 80570317cb
1 changed files with 46 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

71
reactos/ntoskrnl/include/internal/ntoskrnl.h
View file

@ -90,11 +90,11 @@ static __inline
NTSTATUS NTSTATUS
NTAPI NTAPI
ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest, ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest,
KPROCESSOR_MODE CurrentMode, IN KPROCESSOR_MODE CurrentMode,
IN PUNICODE_STRING UnsafeSrc) IN PUNICODE_STRING UnsafeSrc)
{ {
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
PVOID Buffer; WCHAR *Buffer;
ASSERT(Dest != NULL); ASSERT(Dest != NULL);
/* Probe the structure and buffer*/ /* Probe the structure and buffer*/
@ -106,11 +106,44 @@ ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest,
sizeof(UNICODE_STRING), sizeof(UNICODE_STRING),
sizeof(ULONG)); sizeof(ULONG));
*Dest = *UnsafeSrc; *Dest = *UnsafeSrc;
if(Dest->Length > 0) if(Dest->Buffer != NULL)
{ {
ProbeForRead(Dest->Buffer, if (Dest->Length != 0)
Dest->Length, {
sizeof(WCHAR)); ProbeForRead(Dest->Buffer,
Dest->Length,
sizeof(WCHAR));
/* Allocate space for the buffer */
Buffer = ExAllocatePoolWithTag(PagedPool,
Dest->Length + sizeof(WCHAR),
TAG('U', 'S', 'T', 'R'));
if (Buffer == NULL)
{
Status = STATUS_INSUFFICIENT_RESOURCES;
_SEH_LEAVE;
}
/* Copy it */
RtlCopyMemory(Buffer, Dest->Buffer, Dest->Length);
Buffer[Dest->Length / sizeof(WCHAR)] = UNICODE_NULL;
/* Set it as the buffer */
Dest->Buffer = Buffer;
}
else
{
/* sanitize structure */
Dest->Length = 0;
Dest->MaximumLength = 0;
Dest->Buffer = NULL;
}
}
else
{
/* sanitize structure */
Dest->Length = 0;
Dest->MaximumLength = 0;
} }
} }
_SEH_HANDLE _SEH_HANDLE
@ -118,29 +151,14 @@ ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest,
Status = _SEH_GetExceptionCode(); Status = _SEH_GetExceptionCode();
} }
_SEH_END; _SEH_END;
if (!NT_SUCCESS(Status)) return Status;
} }
else else
{ {
/* Just copy it directly */ /* Just copy the UNICODE_STRING structure, don't allocate new memory!
We trust the caller to supply valid pointers and data. */
*Dest = *UnsafeSrc; *Dest = *UnsafeSrc;
} }
/* Allocate space for the buffer */
Buffer = ExAllocatePool(PagedPool, Dest->MaximumLength);
if (Buffer != NULL)
{
/* Copy it */
RtlCopyMemory(Buffer, Dest->Buffer, Dest->MaximumLength);
/* Set it as the buffer */
Dest->Buffer = Buffer;
}
else
Status = STATUS_INSUFFICIENT_RESOURCES;
/* Return */ /* Return */
return Status; return Status;
} }
@ -149,9 +167,12 @@ static __inline
VOID VOID
NTAPI NTAPI
ReleaseCapturedUnicodeString(IN PUNICODE_STRING CapturedString, ReleaseCapturedUnicodeString(IN PUNICODE_STRING CapturedString,
KPROCESSOR_MODE CurrentMode) IN KPROCESSOR_MODE CurrentMode)
{ {
if(CurrentMode != KernelMode) ExFreePool(CapturedString->Buffer); if(CurrentMode != KernelMode && CapturedString->Buffer != NULL)
{
ExFreePool(CapturedString->Buffer);
}
} }
/* /*