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