Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-19 18:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR]

Browse source 
Implement HeapVerify(), fix a buffer overrun.
CORE-6893 #resolve

svn path=/trunk/; revision=58341
This commit is contained in:
Timo Kreuzer 2013-02-18 20:09:50 +00:00
parent 0d3e08073b
commit 5db929f369
3 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/boot/freeldr/freeldr/include/mm.h
View file

@ -132,6 +132,10 @@ VOID
HeapRelease(
PVOID HeapHandle);
VOID
HeapVerify(
PVOID HeapHandle);
VOID
HeapCleanupAll(VOID);

2
reactos/boot/freeldr/freeldr/inifile/inifile.c
View file

@ -190,7 +190,7 @@ BOOLEAN IniAddSection(PCSTR SectionName, ULONG_PTR* SectionId)
RtlZeroMemory(Section, sizeof(INI_SECTION));
// Allocate the section name buffer
Section->SectionName = MmHeapAlloc(strlen(SectionName));
Section->SectionName = MmHeapAlloc(strlen(SectionName) + sizeof(CHAR));
if (!Section->SectionName)
{
MmHeapFree(Section);

34
reactos/boot/freeldr/freeldr/mm/heap.c
View file

@ -149,6 +149,32 @@ HeapDestroy(
LoaderFirmwareTemporary);
}
#ifdef FREELDR_HEAP_VERIFIER
VOID
HeapVerify(
PVOID HeapHandle)
{
PHEAP Heap = HeapHandle;
PHEAP_BLOCK Block;
/* Loop all heap chunks */
for (Block = &Heap->Blocks;
Block->Size != 0;
Block = Block + 1 + Block->Size)
{
/* Continue, if its not free */
if (Block->Tag != 0)
{
/* Verify size and redzones */
ASSERT(*REDZONE_SIZE(Block) <= Block->Size * sizeof(HEAP_BLOCK));
ASSERT(*REDZONE_LOW(Block) == REDZONE_MARK);
ASSERT(*REDZONE_HI(Block) == REDZONE_MARK);
continue;
}
}
}
#endif /* FREELDR_HEAP_VERIFIER */
VOID
HeapRelease(
PVOID HeapHandle)
@ -296,6 +322,9 @@ HeapAllocate(
ULONGLONG Time = __rdtsc();
#ifdef FREELDR_HEAP_VERIFIER
/* Verify the heap */
HeapVerify(HeapHandle);
/* Add space for a size field and 2 redzones */
ByteSize += REDZONE_ALLOCATION;
#endif
@ -408,6 +437,11 @@ HeapFree(
TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer);
ASSERT(Tag != 'dnE#');
#ifdef FREELDR_HEAP_VERIFIER
/* Verify the heap */
HeapVerify(HeapHandle);
#endif
/* Check if the block is really inside this heap */
if ((Pointer < (PVOID)(Heap + 1)) ||
(Pointer > (PVOID)((PUCHAR)Heap + Heap->MaximumSize)))