From dbac7d6914a2a370bca54f9912dbfeaee2182584 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Mon, 22 Oct 2018 21:28:24 -0400 Subject: backport m-c bug 1333174 - Don't use NS_ENSURE_SUCCESS at nsIOService:793 Log spam fix. Suppresses 1,100 instances of NS_ENSURE_SUCCESS(rv, rv) failed with result 0x80520012 emitted from netwerk/base/nsIOService.cpp during linux64 debug testing. Backports [m-c 1333174](https://bugzilla.mozilla.org/show_bug.cgi?id=1333174). --- netwerk/base/nsIOService.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'netwerk') diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp index e13541acf..435294315 100644 --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -789,7 +789,9 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI, // creating a new channel by calling NewChannel(). if (NS_FAILED(rv)) { rv = handler->NewChannel(aURI, getter_AddRefs(channel)); - NS_ENSURE_SUCCESS(rv, rv); + if (NS_FAILED(rv)) { + return rv; + } // The protocol handler does not implement NewChannel2, so // maybe we need to wrap the channel (see comment in MaybeWrap // function). -- cgit v1.2.3