mozilla-aarch64-startup-crash.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 19 Mar 2019 09:56:49 +0100
branchfirefox60
changeset 1091 cbed5671ff47
parent 1090 554cd9503f75
permissions -rw-r--r--
60.6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
933
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
     3
# Parent  85c2e07d2a9ec3e45f55d0e482c7b663626bfc8a
933
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
--- a/netwerk/base/nsIOService.cpp
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+++ b/netwerk/base/nsIOService.cpp
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
     9
@@ -874,18 +874,23 @@ nsresult nsIOService::NewChannelFromURIW
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    10
             u"Http channel implementation "
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    11
             "doesn't support nsIUploadChannel2. An extension has "
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    12
             "supplied a non-functional http protocol handler. This will "
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    13
             "break behavior and in future releases not work at all.");
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    14
       }
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    15
       gHasWarnedUploadChannel2 = true;
933
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
     }
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    17
   }
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    18
-
933
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+#if defined(__aarch64__)
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    20
+  if (result) {
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    21
+      channel.forget(result);
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    22
+  }
933
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
+#else
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    24
   channel.forget(result);
933
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
+#endif
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    26
   return NS_OK;
933
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
 }
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
 
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
 NS_IMETHODIMP
1090
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    30
 nsIOService::NewChannelFromURIWithProxyFlags2(
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    31
     nsIURI *aURI, nsIURI *aProxyURI, uint32_t aProxyFlags,
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    32
     nsIDOMNode *aLoadingNode, nsIPrincipal *aLoadingPrincipal,
554cd9503f75 ESR 60.5
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1033
diff changeset
    33
     nsIPrincipal *aTriggeringPrincipal, uint32_t aSecurityFlags,