Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark freed memory in stack arena with 0xdd. b=161283 sr=bzbarsky r=kin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@127256 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu
2002-08-14 12:49:24 +00:00
parent 83790ad136
commit 47bcd9d189
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/layout/base/nsPresShell.cpp
View File

@@ -549,6 +549,20 @@ StackArena::Pop()
// pop off the mark
NS_ASSERTION(mStackTop > 0, "Error Pop called 1 too many times");
mStackTop--;
#ifdef DEBUG
// Mark the "freed" memory with 0xdd to help with debugging of memory
// allocation problems.
{
StackBlock *block = mMarks[mStackTop].mBlock, *block_end = mCurBlock;
size_t pos = mMarks[mStackTop].mPos;
for (; block != block_end; block = block->mNext, pos = 0) {
memset(block->mBlock + pos, 0xdd, sizeof(block->mBlock) - pos);
}
memset(block->mBlock + pos, 0xdd, mPos - pos);
}
#endif
mCurBlock = mMarks[mStackTop].mBlock;
mPos = mMarks[mStackTop].mPos;
@@ -1870,11 +1884,7 @@ PresShell::PushStackMemory()
NS_IMETHODIMP
PresShell::PopStackMemory()
{
if (!mStackArena) {
mStackArena = new StackArena();
if (!mStackArena)
return NS_ERROR_OUT_OF_MEMORY;
}
NS_ENSURE_TRUE(mStackArena, NS_ERROR_UNEXPECTED);
return mStackArena->Pop();
}

20
mozilla/layout/html/base/src/nsPresShell.cpp
View File

@@ -549,6 +549,20 @@ StackArena::Pop()
// pop off the mark
NS_ASSERTION(mStackTop > 0, "Error Pop called 1 too many times");
mStackTop--;
#ifdef DEBUG
// Mark the "freed" memory with 0xdd to help with debugging of memory
// allocation problems.
{
StackBlock *block = mMarks[mStackTop].mBlock, *block_end = mCurBlock;
size_t pos = mMarks[mStackTop].mPos;
for (; block != block_end; block = block->mNext, pos = 0) {
memset(block->mBlock + pos, 0xdd, sizeof(block->mBlock) - pos);
}
memset(block->mBlock + pos, 0xdd, mPos - pos);
}
#endif
mCurBlock = mMarks[mStackTop].mBlock;
mPos = mMarks[mStackTop].mPos;
@@ -1870,11 +1884,7 @@ PresShell::PushStackMemory()
NS_IMETHODIMP
PresShell::PopStackMemory()
{
if (!mStackArena) {
mStackArena = new StackArena();
if (!mStackArena)
return NS_ERROR_OUT_OF_MEMORY;
}
NS_ENSURE_TRUE(mStackArena, NS_ERROR_UNEXPECTED);
return mStackArena->Pop();
}