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

[RTL] Capture parameters with using SEH. Fixes new test for ntdll:RtlAllocateHeap

Browse source 
svn path=/trunk/; revision=72802
This commit is contained in:
Dmitry Chapyshev 2016-09-25 17:05:52 +00:00
parent 92e7c0979a
commit 28e32eb784
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
reactos/sdk/lib/rtl/heap.c
View file

@ -1256,8 +1256,23 @@ RtlCreateHeap(ULONG Flags,
Flags &= HEAP_CREATE_VALID_MASK; Flags &= HEAP_CREATE_VALID_MASK;
} }
/* TODO: Capture parameters, once we decide to use SEH */ /* Capture parameters */
if (!Parameters) Parameters = &SafeParams; if (Parameters)
{
_SEH2_TRY
{
/* If size of structure correct, then copy it */
if (Parameters->Length == sizeof(RTL_HEAP_PARAMETERS))
RtlCopyMemory(&SafeParams, Parameters, sizeof(RTL_HEAP_PARAMETERS));
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
_SEH2_YIELD(return NULL);
}
_SEH2_END;
}
Parameters = &SafeParams;
/* Check global flags */ /* Check global flags */
if (NtGlobalFlags & FLG_HEAP_DISABLE_COALESCING) if (NtGlobalFlags & FLG_HEAP_DISABLE_COALESCING)
@ -1960,7 +1975,7 @@ RtlAllocateHeap(IN PVOID HeapPtr,
/* Add settable user flags, if any */ /* Add settable user flags, if any */
EntryFlags |= (Flags & HEAP_SETTABLE_USER_FLAGS) >> 4; EntryFlags |= (Flags & HEAP_SETTABLE_USER_FLAGS) >> 4;
Index = AllocationSize >> HEAP_ENTRY_SHIFT; Index = AllocationSize >> HEAP_ENTRY_SHIFT;
/* Acquire the lock if necessary */ /* Acquire the lock if necessary */
if (!(Flags & HEAP_NO_SERIALIZE)) if (!(Flags & HEAP_NO_SERIALIZE))