Commit 1a378c87 authored by Liang-Heng Chen's avatar Liang-Heng Chen Committed by Georg Koppen
Browse files

Bug 1311275 - use protocol service directly instead of NS_GetFileFromURLSpec; r=mayhemer 

MozReview-Commit-ID: 26ElbTXr6fI

--HG--
extra : rebase_source : bad92dfad90b4cee8a850cdf29a85832f16f8149

This is a backport we need due to an assertion failure caused by a
previous patch (see: #20304). Fixes bug 20490.
parent c8d38b29

netwerk/socket/nsSOCKSIOLayer.cpp

+15 −4
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ 
#include "nsIDNSListener.h"

#include "nsICancelable.h"

#include "nsThreadUtils.h"

#include "nsIURL.h"

#include "nsIFile.h"

#include "nsNetUtil.h"

#include "nsIFileProtocolHandler.h"

#include "mozilla/Logging.h"

#include "mozilla/net/DNS.h"

#include "mozilla/unused.h"
@@ -135,8 +134,20 @@ private: 
        nsresult rv;

        MOZ_ASSERT(aProxyAddr);



        nsCOMPtr<nsIProtocolHandler> protocolHandler(

            do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "file", &rv));

        if (NS_WARN_IF(NS_FAILED(rv))) {

            return rv;

        }



        nsCOMPtr<nsIFileProtocolHandler> fileHandler(

            do_QueryInterface(protocolHandler, &rv));

        if (NS_WARN_IF(NS_FAILED(rv))) {

            return rv;

        }



        nsCOMPtr<nsIFile> socketFile;

        rv = NS_GetFileFromURLSpec(aDomainSocketPath,

        rv = fileHandler->GetFileFromURLSpec(aDomainSocketPath,

                                             getter_AddRefs(socketFile));

        if (NS_WARN_IF(NS_FAILED(rv))) {

            return rv;