From 84b08eede7b30bb190e6d1c06e2fdcdc320bfe6c Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Thu, 31 Aug 2000 03:10:52 +0000 Subject: [PATCH] check for null context before clearing JS watchpoints. bug 49615. patch from afranke@ags.uni-sb.de. r=brendan, me a=brendan git-svn-id: svn://10.0.0.236/trunk@77726 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/base/nsGlobalWindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 05db078b5d5..e4b31b8bb55 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -262,8 +262,9 @@ NS_IMETHODIMP GlobalWindowImpl::SetNewDocument(nsIDOMDocument* aDocument) // when those sub-window objects are finalized, after JS_ClearScope and // a GC run that finds them to be garbage. - ::JS_ClearWatchPointsForObject((JSContext *) mContext->GetNativeContext(), - (JSObject *) mScriptObject); + if (mContext && mScriptObject) + ::JS_ClearWatchPointsForObject((JSContext *) mContext->GetNativeContext(), + (JSObject *) mScriptObject); if (mFirstDocumentLoad) { mFirstDocumentLoad = PR_FALSE;