From d15e50fa606a8bfff4c340e73bce64e3ca3831c1 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Thu, 19 Apr 2001 00:59:56 +0000 Subject: [PATCH] fix for #76200. crash when viewing a message with an tag but no src. r/sr=valeski,mscott. a=blizzard --- mailnews/base/util/nsMsgMailNewsUrl.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mailnews/base/util/nsMsgMailNewsUrl.cpp index 90470a3ff277..871af767d78c 100644 --- a/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -482,7 +482,22 @@ NS_IMETHODIMP nsMsgMailNewsUrl::Equals(nsIURI *other, PRBool *_retval) NS_IMETHODIMP nsMsgMailNewsUrl::SchemeIs(const char *aScheme, PRBool *_retval) { + nsXPIDLCString scheme; + nsresult rv = m_baseURL->GetScheme(getter_Copies(scheme)); + NS_ENSURE_SUCCESS(rv,rv); + + // fix #76200 crash on email with with no src. + // + // make sure we have a scheme before calling SchemeIs() + // we have to do this because url parsing can result in a null mScheme + // this extra string copy should be removed when #73845 is fixed. + if (scheme.get()) { return m_baseURL->SchemeIs(aScheme, _retval); + } + else { + *_retval = PR_FALSE; + return NS_OK; + } } NS_IMETHODIMP nsMsgMailNewsUrl::Clone(nsIURI **_retval)