1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1558442998 -7200 |
3 # Date 1558442998 -7200 |
4 # Tue May 21 14:49:58 2019 +0200 |
4 # Tue May 21 14:49:58 2019 +0200 |
5 # Node ID 386083b58d8558141901d796ec6919a4aba7ad3a |
5 # Node ID 386083b58d8558141901d796ec6919a4aba7ad3a |
6 # Parent a30a9b9aae5740f096a16118ed9e4bc45d3d1c35 |
6 # Parent 76b747f7d113bddbb8593184d81e1bfe5fd51af0 |
7 bsc#991344 - Rpi3: Firefox crashes after a few seconds of usage |
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() |
8 bmo#1302554 - ARM/AARCH64: Firefox crashes on NULL nsIChannel** result pointer in nsIOService::NewChannelFromURIWithProxyFlagsInternal() |
9 |
9 |
10 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp |
10 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp |
11 --- a/netwerk/base/nsIOService.cpp |
11 --- a/netwerk/base/nsIOService.cpp |
12 +++ b/netwerk/base/nsIOService.cpp |
12 +++ b/netwerk/base/nsIOService.cpp |
13 @@ -1032,17 +1032,23 @@ nsresult nsIOService::NewChannelFromURIW |
13 @@ -1159,7 +1159,13 @@ 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; |
|
19 } |
14 } |
20 } |
15 } |
21 |
16 |
22 +#if defined(__aarch64__) |
17 +#if defined(__aarch64__) |
23 + if (result) { |
18 + if (result) { |
27 channel.forget(result); |
22 channel.forget(result); |
28 +#endif |
23 +#endif |
29 return NS_OK; |
24 return NS_OK; |
30 } |
25 } |
31 |
26 |
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, |
|