2016-12-12 19:36:34 +01:00
|
|
|
# HG changeset patch
|
2019-07-09 23:21:11 +02:00
|
|
|
# User msirringhaus@suse.de
|
|
|
|
# Date 1558442998 -7200
|
|
|
|
# Tue May 21 14:49:58 2019 +0200
|
|
|
|
# Node ID 386083b58d8558141901d796ec6919a4aba7ad3a
|
2020-03-12 20:14:24 +01:00
|
|
|
# Parent a30a9b9aae5740f096a16118ed9e4bc45d3d1c35
|
2019-07-09 23:21:11 +02:00
|
|
|
bsc#991344 - Rpi3: Firefox crashes after a few seconds of usage
|
|
|
|
bmo#1302554 - ARM/AARCH64: Firefox crashes on NULL nsIChannel** result pointer in nsIOService::NewChannelFromURIWithProxyFlagsInternal()
|
2016-12-12 19:36:34 +01:00
|
|
|
|
2020-03-12 20:14:24 +01:00
|
|
|
diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
|
|
|
|
--- a/netwerk/base/nsIOService.cpp
|
|
|
|
+++ b/netwerk/base/nsIOService.cpp
|
|
|
|
@@ -1032,17 +1032,23 @@ nsresult nsIOService::NewChannelFromURIW
|
|
|
|
"doesn't support nsIUploadChannel2. An extension has "
|
|
|
|
"supplied a non-functional http protocol handler. This will "
|
|
|
|
"break behavior and in future releases not work at all.");
|
|
|
|
}
|
|
|
|
gHasWarnedUploadChannel2 = true;
|
2016-12-12 19:36:34 +01:00
|
|
|
}
|
2019-01-29 19:07:12 +01:00
|
|
|
}
|
2016-12-12 19:36:34 +01:00
|
|
|
|
|
|
|
+#if defined(__aarch64__)
|
2019-01-29 19:07:12 +01:00
|
|
|
+ if (result) {
|
2019-07-09 23:21:11 +02:00
|
|
|
+ channel.forget(result);
|
2019-01-29 19:07:12 +01:00
|
|
|
+ }
|
2016-12-12 19:36:34 +01:00
|
|
|
+#else
|
2019-01-29 19:07:12 +01:00
|
|
|
channel.forget(result);
|
2016-12-12 19:36:34 +01:00
|
|
|
+#endif
|
2019-01-29 19:07:12 +01:00
|
|
|
return NS_OK;
|
2016-12-12 19:36:34 +01:00
|
|
|
}
|
|
|
|
|
2020-03-12 20:14:24 +01:00
|
|
|
NS_IMETHODIMP
|
|
|
|
nsIOService::NewChannelFromURIWithProxyFlags(
|
|
|
|
nsIURI* aURI, nsIURI* aProxyURI, uint32_t aProxyFlags,
|
|
|
|
nsINode* aLoadingNode, nsIPrincipal* aLoadingPrincipal,
|
|
|
|
nsIPrincipal* aTriggeringPrincipal, uint32_t aSecurityFlags,
|