1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10 |
2 # User msirringhaus@suse.de |
3 # Parent 6dd2311796da4e15115fd04b181313ae62754317 |
3 # Date 1558442998 -7200 |
4 Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage |
4 # Tue May 21 14:49:58 2019 +0200 |
|
5 # Node ID 386083b58d8558141901d796ec6919a4aba7ad3a |
|
6 # Parent 835641be7eb9408aa1eff0d38b37f6c523d2ef98 |
|
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() |
5 |
9 |
6 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp |
10 diff -r 835641be7eb9 -r 386083b58d85 netwerk/base/nsIOService.cpp |
7 --- a/netwerk/base/nsIOService.cpp |
11 --- a/netwerk/base/nsIOService.cpp Fri Feb 26 16:20:09 2016 +0000 |
8 +++ b/netwerk/base/nsIOService.cpp |
12 +++ b/netwerk/base/nsIOService.cpp Tue May 21 14:49:58 2019 +0200 |
9 @@ -975,17 +975,23 @@ nsresult nsIOService::NewChannelFromURIW |
13 @@ -1000,7 +1000,13 @@ |
10 "doesn't support nsIUploadChannel2. An extension has " |
|
11 "supplied a non-functional http protocol handler. This will " |
|
12 "break behavior and in future releases not work at all."); |
|
13 } |
|
14 gHasWarnedUploadChannel2 = true; |
|
15 } |
14 } |
16 } |
15 } |
17 |
16 |
18 +#if defined(__aarch64__) |
17 +#if defined(__aarch64__) |
19 + if (result) { |
18 + if (result) { |
20 + channel.forget(result); |
19 + channel.forget(result); |
21 + } |
20 + } |
22 +#else |
21 +#else |
23 channel.forget(result); |
22 channel.forget(result); |
24 +#endif |
23 +#endif |
25 return NS_OK; |
24 return NS_OK; |
26 } |
25 } |
27 |
26 |
28 NS_IMETHODIMP |
|
29 nsIOService::NewChannelFromURIWithProxyFlags( |
|
30 nsIURI *aURI, nsIURI *aProxyURI, uint32_t aProxyFlags, |
|
31 nsINode *aLoadingNode, nsIPrincipal *aLoadingPrincipal, |
|
32 nsIPrincipal *aTriggeringPrincipal, uint32_t aSecurityFlags, |
|