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

fix for 65617 (unsafe memory allocations in PresShell). r=jag, sr=smfr

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@93595 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dr%netscape.com
2001-05-02 00:36:02 +00:00
parent 1ed301f7ce
commit 2cddd9e6e0
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1655,17 +1655,23 @@ PresShell::Init(nsIDocument* aDocument,
NS_IMETHODIMP
PresShell::PushStackMemory()
{
if (nsnull == mStackArena)
mStackArena = new StackArena();
if (!mStackArena) {
mStackArena = new StackArena();
if (!mStackArena)
return NS_ERROR_OUT_OF_MEMORY;
}
return mStackArena->Push();
}
NS_IMETHODIMP
PresShell::PopStackMemory()
{
if (nsnull == mStackArena)
mStackArena = new StackArena();
if (!mStackArena) {
mStackArena = new StackArena();
if (!mStackArena)
return NS_ERROR_OUT_OF_MEMORY;
}
return mStackArena->Pop();
}
@@ -1673,8 +1679,11 @@ PresShell::PopStackMemory()
NS_IMETHODIMP
PresShell::AllocateStackMemory(size_t aSize, void** aResult)
{
if (nsnull == mStackArena)
mStackArena = new StackArena();
if (!mStackArena) {
mStackArena = new StackArena();
if (!mStackArena)
return NS_ERROR_OUT_OF_MEMORY;
}
return mStackArena->Allocate(aSize, aResult);
}