summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaming4JC <g4jc@bulletmail.org>2018-10-22 21:28:24 -0400
committerGaming4JC <g4jc@bulletmail.org>2018-10-22 21:32:16 -0400
commitdbac7d6914a2a370bca54f9912dbfeaee2182584 (patch)
tree87c30df25e8209bad812be9a458151c344b018d6
parent61a05da018433899a6991409eb5711bce0a901fb (diff)
downloadUXP-dbac7d6914a2a370bca54f9912dbfeaee2182584.tar
UXP-dbac7d6914a2a370bca54f9912dbfeaee2182584.tar.gz
UXP-dbac7d6914a2a370bca54f9912dbfeaee2182584.tar.lz
UXP-dbac7d6914a2a370bca54f9912dbfeaee2182584.tar.xz
UXP-dbac7d6914a2a370bca54f9912dbfeaee2182584.zip
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).
-rw-r--r--netwerk/base/nsIOService.cpp4
1 files changed, 3 insertions, 1 deletions
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).