From 53ff6e399439fc80c2689da349429fad7eed1678 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Thu, 7 Oct 1999 23:29:13 +0000 Subject: [PATCH] Bug #12198 --> don't dereference a null ptr for the uri. return gracefully. r=sspitzer git-svn-id: svn://10.0.0.236/trunk@50167 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 5 ++++- mozilla/webshell/src/nsWebShell.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index fac02998bb7..f1673415dc3 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -2241,7 +2241,10 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, } - //Take care of mailto: url + if (!uri) // we were unable to create a uri + return rv; + + //Take care of mailto: url PRBool isMail= PR_FALSE; rv = uri->GetSpec(getter_Copies(spec)); if (NS_FAILED(rv)) diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index fac02998bb7..f1673415dc3 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -2241,7 +2241,10 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec, } - //Take care of mailto: url + if (!uri) // we were unable to create a uri + return rv; + + //Take care of mailto: url PRBool isMail= PR_FALSE; rv = uri->GetSpec(getter_Copies(spec)); if (NS_FAILED(rv))