mozilla-aarch64-startup-crash.patch
branchfirefox65
changeset 1085 87f893cf45b9
parent 1067 735b140fb042
child 1093 3942c205588b
--- a/mozilla-aarch64-startup-crash.patch	Sat Jan 26 22:42:57 2019 +0100
+++ b/mozilla-aarch64-startup-crash.patch	Thu Jan 31 11:21:22 2019 +0100
@@ -1,32 +1,32 @@
 # HG changeset patch
 # Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10
-# Parent  07236b512cd930e3fc7a94fed549431ccaa51c90
+# Parent  7b5f6b68a8963228f738b803177f937481e19745
 Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage
 
 diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
 --- a/netwerk/base/nsIOService.cpp
 +++ b/netwerk/base/nsIOService.cpp
-@@ -923,17 +923,23 @@ nsIOService::NewChannelFromURIWithProxyF
-                     "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;
-         }
+@@ -842,17 +842,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;
      }
+   }
  
 +#if defined(__aarch64__)
-+    if (result) {
-+        channel.forget(result);
-+    }
++  if (result) {
++      channel.forget(result);
++  }
 +#else
-     channel.forget(result);
+   channel.forget(result);
 +#endif
-     return NS_OK;
+   return NS_OK;
  }
  
  NS_IMETHODIMP
- nsIOService::NewChannelFromURIWithProxyFlags2(nsIURI* aURI,
-                                               nsIURI* aProxyURI,
-                                               uint32_t aProxyFlags,
-                                               nsINode* aLoadingNode,
+ nsIOService::NewChannelFromURIWithProxyFlags2(
+     nsIURI *aURI, nsIURI *aProxyURI, uint32_t aProxyFlags,
+     nsINode *aLoadingNode, nsIPrincipal *aLoadingPrincipal,
+     nsIPrincipal *aTriggeringPrincipal, uint32_t aSecurityFlags,