Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-19 00:54:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Filip Navara <xnavara at volny dot cz> 's christmas gift

Browse source 
- Fix certain cases of deallocation inside registry hives.
- Add debug output in case of a problem in HvpRemoveFree.

svn path=/trunk/; revision=31299
This commit is contained in:
Aleksey Bragin 2007-12-18 10:13:45 +00:00
parent cf6d1c80e6
commit 0bb029564f
1 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
reactos/lib/cmlib/hivecell.c
View file

@ -205,7 +205,7 @@ HvpRemoveFree(
PHCELL_INDEX FreeCellData; PHCELL_INDEX FreeCellData;
PHCELL_INDEX pFreeCellOffset; PHCELL_INDEX pFreeCellOffset;
HSTORAGE_TYPE Storage; HSTORAGE_TYPE Storage;
ULONG Index; ULONG Index, FreeListIndex;
ASSERT(RegistryHive->ReadOnly == FALSE); ASSERT(RegistryHive->ReadOnly == FALSE);
@ -224,6 +224,24 @@ HvpRemoveFree(
pFreeCellOffset = FreeCellData; pFreeCellOffset = FreeCellData;
} }
/* Something bad happened, print a useful trace info and bugcheck */
CMLTRACE(CMLIB_HCELL_DEBUG, "-- beginning of HvpRemoveFree trace --\n");
CMLTRACE(CMLIB_HCELL_DEBUG, "block we are about to free: %08x\n", CellIndex);
CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %d\n", Index);
for (FreeListIndex = 0; FreeListIndex < 24; FreeListIndex++)
{
CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%d]: ", FreeListIndex);
pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[FreeListIndex];
while (*pFreeCellOffset != HCELL_NIL)
{
CMLTRACE(CMLIB_HCELL_DEBUG, "%08x ", *pFreeCellOffset);
FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset);
pFreeCellOffset = FreeCellData;
}
CMLTRACE(CMLIB_HCELL_DEBUG, "\n");
}
CMLTRACE(CMLIB_HCELL_DEBUG, "-- end of HvpRemoveFree trace --\n");
ASSERT(FALSE); ASSERT(FALSE);
} }
@ -466,11 +484,23 @@ HvFreeCell(
{ {
if ((ULONG_PTR)Neighbor + Neighbor->Size == (ULONG_PTR)Free) if ((ULONG_PTR)Neighbor + Neighbor->Size == (ULONG_PTR)Free)
{ {
Neighbor->Size += Free->Size; HCELL_INDEX NeighborCellIndex =
(HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin +
Bin->FileOffset) | (CellIndex & HCELL_TYPE_MASK);
if (HvpComputeFreeListIndex(Neighbor->Size) !=
HvpComputeFreeListIndex(Neighbor->Size + Free->Size))
{
HvpRemoveFree(RegistryHive, Neighbor, NeighborCellIndex);
Neighbor->Size += Free->Size;
HvpAddFree(RegistryHive, Neighbor, NeighborCellIndex);
}
else
Neighbor->Size += Free->Size;
if (CellType == Stable) if (CellType == Stable)
HvMarkCellDirty(RegistryHive, HvMarkCellDirty(RegistryHive, NeighborCellIndex, FALSE);
(HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin +
Bin->FileOffset), FALSE);
return; return;
} }
Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size); Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size);