Bug 519729 - Crash [@nsHttpsHandler::GetProtocolFlags(unsigned int*)] with COMPUTERBILD Abzockschutz addon. r=cbiesinger

This commit is contained in:
Justin Dolske 2009-11-06 18:40:13 -08:00
parent 573a72ba43
commit d2094178e3

View File

@ -120,6 +120,8 @@ static NS_DEFINE_CID(kSocketProviderServiceCID, NS_SOCKETPROVIDERSERVICE_CID);
#define HTTP_PREF(_pref) HTTP_PREF_PREFIX _pref
#define BROWSER_PREF(_pref) BROWSER_PREF_PREFIX _pref
#define NS_HTTP_PROTOCOL_FLAGS (URI_STD | ALLOWS_PROXY | ALLOWS_PROXY_HTTP | URI_LOADABLE_BY_ANYONE)
//-----------------------------------------------------------------------------
static nsresult
@ -1413,8 +1415,7 @@ nsHttpHandler::GetDefaultPort(PRInt32 *result)
NS_IMETHODIMP
nsHttpHandler::GetProtocolFlags(PRUint32 *result)
{
*result = URI_STD | ALLOWS_PROXY | ALLOWS_PROXY_HTTP |
URI_LOADABLE_BY_ANYONE;
*result = NS_HTTP_PROTOCOL_FLAGS;
return NS_OK;
}
@ -1774,7 +1775,8 @@ nsHttpsHandler::GetDefaultPort(PRInt32 *aPort)
NS_IMETHODIMP
nsHttpsHandler::GetProtocolFlags(PRUint32 *aProtocolFlags)
{
return gHttpHandler->GetProtocolFlags(aProtocolFlags);
*aProtocolFlags = NS_HTTP_PROTOCOL_FLAGS;
return NS_OK;
}
NS_IMETHODIMP
@ -1789,6 +1791,9 @@ nsHttpsHandler::NewURI(const nsACString &aSpec,
NS_IMETHODIMP
nsHttpsHandler::NewChannel(nsIURI *aURI, nsIChannel **_retval)
{
NS_ABORT_IF_FALSE(gHttpHandler, "Should have a HTTP handler by now.");
if (!gHttpHandler)
return NS_ERROR_UNEXPECTED;
return gHttpHandler->NewChannel(aURI, _retval);
}