diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-10-24 11:13:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-10-24 11:13:33 +0200 |
| commit | 579881ffb4aa0b145c793825cd1b0628e7cd6cdc (patch) | |
| tree | 65d59fc6b73f120ac1bc2214d4a8442421076b04 /netwerk | |
| parent | a02c44648a3f7d6f3904eebba026ce5e6f781bef (diff) | |
| parent | f71c04d814416ebf52dd54109f2d04f1cbd397c0 (diff) | |
| download | UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.gz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.lz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.tar.xz UXP-579881ffb4aa0b145c793825cd1b0628e7cd6cdc.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'netwerk')
| -rw-r--r-- | netwerk/base/nsIOService.cpp | 4 | ||||
| -rw-r--r-- | netwerk/base/nsNetUtilInlines.h | 4 |
2 files changed, 6 insertions, 2 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). diff --git a/netwerk/base/nsNetUtilInlines.h b/netwerk/base/nsNetUtilInlines.h index 7003814d5..b831ec2e7 100644 --- a/netwerk/base/nsNetUtilInlines.h +++ b/netwerk/base/nsNetUtilInlines.h @@ -224,7 +224,9 @@ NS_NewChannelInternal(nsIChannel **outChannel, aUri, aLoadInfo, getter_AddRefs(channel)); - NS_ENSURE_SUCCESS(rv, rv); + if (NS_FAILED(rv)) { + return rv; + } if (aLoadGroup) { rv = channel->SetLoadGroup(aLoadGroup); |