# HG changeset patch

# User msirringhaus@suse.de

# Date 1558442998 -7200

#      Tue May 21 14:49:58 2019 +0200

# Node ID 386083b58d8558141901d796ec6919a4aba7ad3a

# Parent  a30a9b9aae5740f096a16118ed9e4bc45d3d1c35

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()

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;

     }

   }

+#if defined(__aarch64__)

+  if (result) {

+    channel.forget(result);

+  }

+#else

   channel.forget(result);

+#endif

   return NS_OK;

 }

 NS_IMETHODIMP

 nsIOService::NewChannelFromURIWithProxyFlags(

     nsIURI* aURI, nsIURI* aProxyURI, uint32_t aProxyFlags,

     nsINode* aLoadingNode, nsIPrincipal* aLoadingPrincipal,

     nsIPrincipal* aTriggeringPrincipal, uint32_t aSecurityFlags,