mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-12 11:04:32 +00:00
bug 499203 null deref in nsprotocolproxyservice::getprotocolinfo with null nsiuri r=biesi
This commit is contained in:
parent
3b2b9b8d2c
commit
103a7144e1
@ -819,6 +819,8 @@ NS_IMETHODIMP
|
|||||||
nsProtocolProxyService::Resolve(nsIURI *uri, uint32_t flags,
|
nsProtocolProxyService::Resolve(nsIURI *uri, uint32_t flags,
|
||||||
nsIProxyInfo **result)
|
nsIProxyInfo **result)
|
||||||
{
|
{
|
||||||
|
NS_ENSURE_ARG_POINTER(uri);
|
||||||
|
|
||||||
nsProtocolInfo info;
|
nsProtocolInfo info;
|
||||||
nsresult rv = GetProtocolInfo(uri, &info);
|
nsresult rv = GetProtocolInfo(uri, &info);
|
||||||
if (NS_FAILED(rv))
|
if (NS_FAILED(rv))
|
||||||
@ -864,6 +866,9 @@ nsProtocolProxyService::AsyncResolve(nsIURI *uri, uint32_t flags,
|
|||||||
nsIProtocolProxyCallback *callback,
|
nsIProtocolProxyCallback *callback,
|
||||||
nsICancelable **result)
|
nsICancelable **result)
|
||||||
{
|
{
|
||||||
|
NS_ENSURE_ARG_POINTER(uri);
|
||||||
|
NS_ENSURE_ARG_POINTER(callback);
|
||||||
|
|
||||||
nsRefPtr<nsAsyncResolveRequest> ctx =
|
nsRefPtr<nsAsyncResolveRequest> ctx =
|
||||||
new nsAsyncResolveRequest(this, uri, flags, callback);
|
new nsAsyncResolveRequest(this, uri, flags, callback);
|
||||||
if (!ctx)
|
if (!ctx)
|
||||||
@ -1173,6 +1178,9 @@ loser:
|
|||||||
nsresult
|
nsresult
|
||||||
nsProtocolProxyService::GetProtocolInfo(nsIURI *uri, nsProtocolInfo *info)
|
nsProtocolProxyService::GetProtocolInfo(nsIURI *uri, nsProtocolInfo *info)
|
||||||
{
|
{
|
||||||
|
NS_PRECONDITION(uri, "URI is null");
|
||||||
|
NS_PRECONDITION(info, "info is null");
|
||||||
|
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
|
|
||||||
rv = uri->GetScheme(info->scheme);
|
rv = uri->GetScheme(info->scheme);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user