Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix gc crash if we ever failed to copy a window's properties. Bug 298459, r=darin, a=brendan.

Browse Source
This commit is contained in:
bryner%brianryner.com 2005-08-09 01:46:01 +00:00
parent 80d53bd436
commit 9a35b089ca
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/src/base/nsGlobalWindow.cpp
View File

@ -6600,20 +6600,16 @@ nsGlobalWindow::SaveWindowState(nsISupports **aState)
NS_ENSURE_TRUE(stateObj, NS_ERROR_OUT_OF_MEMORY);
// The window state object will root the JSObject.
*aState = new WindowStateHolder(cx, stateObj, this);
NS_ENSURE_TRUE(*aState, NS_ERROR_OUT_OF_MEMORY);
nsCOMPtr<nsISupports> state = new WindowStateHolder(cx, stateObj, this);
NS_ENSURE_TRUE(state, NS_ERROR_OUT_OF_MEMORY);
#ifdef DEBUG_PAGE_CACHE
printf("saving window state, stateObj = %p\n", (void*)stateObj);
#endif
nsresult rv = CopyJSProperties(cx, mJSObject, stateObj);
if (NS_FAILED(rv)) {
delete *aState;
*aState = nsnull;
return rv;
}
NS_ENSURE_TRUE(rv, rv);
NS_ADDREF(*aState);
state.swap(*aState);
return NS_OK;
}