From fe11dafadfd60c482ec08665b07166de8d18b5e2 Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Fri, 31 Mar 2000 00:31:44 +0000 Subject: [PATCH] Add null ptr checks to avoid crashing, this fixes #30372. r=av@netscape.com git-svn-id: svn://10.0.0.236/trunk@64653 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp index 24b525ecf43..b0375e46849 100644 --- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -87,12 +87,16 @@ nsEvaluateStringProxy::Init(nsIChannel* channel) NS_IMETHODIMP nsEvaluateStringProxy::EvaluateString(char **aRetValue, PRBool *aIsUndefined) { + NS_ENSURE_ARG_POINTER(mChannel); + NS_ENSURE_ARG_POINTER(aRetValue); + NS_ENSURE_ARG_POINTER(aIsUndefined); + nsresult rv; - NS_ENSURE_ARG_POINTER(mChannel); nsCOMPtr callbacks; rv = mChannel->GetNotificationCallbacks(getter_AddRefs(callbacks)); if (NS_FAILED(rv)) return rv; + NS_ENSURE_TRUE(callbacks, NS_ERROR_FAILURE); // The event sink must be a script global Object Owner or we fail. nsCOMPtr globalOwner;