author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sun, 11 Jul 2021 10:26:32 +0200 | |
branch | firefox89 |
changeset 1158 | 00846b9a35cd |
parent 1123 | 7fa561e5d7c7 |
child 1190 | 2a24a948b5cf |
permissions | -rw-r--r-- |
933 | 1 |
# HG changeset patch |
1097 | 2 |
# User msirringhaus@suse.de |
3 |
# Date 1558442998 -7200 |
|
4 |
# Tue May 21 14:49:58 2019 +0200 |
|
5 |
# Node ID 386083b58d8558141901d796ec6919a4aba7ad3a |
|
1123 | 6 |
# Parent a30a9b9aae5740f096a16118ed9e4bc45d3d1c35 |
1097 | 7 |
bsc#991344 - Rpi3: Firefox crashes after a few seconds of usage |
8 |
bmo#1302554 - ARM/AARCH64: Firefox crashes on NULL nsIChannel** result pointer in nsIOService::NewChannelFromURIWithProxyFlagsInternal() |
|
933 | 9 |
|
1123 | 10 |
diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp |
11 |
--- a/netwerk/base/nsIOService.cpp |
|
12 |
+++ b/netwerk/base/nsIOService.cpp |
|
13 |
@@ -1032,17 +1032,23 @@ nsresult nsIOService::NewChannelFromURIW |
|
14 |
"doesn't support nsIUploadChannel2. An extension has " |
|
15 |
"supplied a non-functional http protocol handler. This will " |
|
16 |
"break behavior and in future releases not work at all."); |
|
17 |
} |
|
18 |
gHasWarnedUploadChannel2 = true; |
|
933 | 19 |
} |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
20 |
} |
933 | 21 |
|
22 |
+#if defined(__aarch64__) |
|
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
23 |
+ if (result) { |
1097 | 24 |
+ channel.forget(result); |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
25 |
+ } |
933 | 26 |
+#else |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
27 |
channel.forget(result); |
933 | 28 |
+#endif |
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1067
diff
changeset
|
29 |
return NS_OK; |
933 | 30 |
} |
31 |
||
1123 | 32 |
NS_IMETHODIMP |
33 |
nsIOService::NewChannelFromURIWithProxyFlags( |
|
34 |
nsIURI* aURI, nsIURI* aProxyURI, uint32_t aProxyFlags, |
|
35 |
nsINode* aLoadingNode, nsIPrincipal* aLoadingPrincipal, |
|
36 |
nsIPrincipal* aTriggeringPrincipal, uint32_t aSecurityFlags, |