From 2cddd9e6e014c960ad8e49c7a332f8684da3d79b Mon Sep 17 00:00:00 2001 From: "dr%netscape.com" Date: Wed, 2 May 2001 00:36:02 +0000 Subject: [PATCH] fix for 65617 (unsafe memory allocations in PresShell). r=jag, sr=smfr git-svn-id: svn://10.0.0.236/trunk@93595 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsPresShell.cpp | 23 ++++++++++++++------ mozilla/layout/html/base/src/nsPresShell.cpp | 23 ++++++++++++++------ 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 83a475d04ce..ca7d2b5f45a 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -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); } diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 83a475d04ce..ca7d2b5f45a 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -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); }