Bug 1432031 Disable a MOZ_ASSERT that could start firing on 60 draft
authorTom Ritter <tom@mozilla.com>
Sun, 21 Jan 2018 09:39:11 -0600
changeset 722970 0da55ceb1013e0d78175860b60f73d8bb7733852
parent 722937 0e3b71fe3a081111865c5a7b982651a4ac597c84
child 746727 09ae39d25fb1f8c7f9553d3d4e40e9299c1ec297
push id96280
push userbmo:tom@mozilla.com
push dateSun, 21 Jan 2018 15:39:33 +0000
bugs1432031
milestone59.0a1
Bug 1432031 Disable a MOZ_ASSERT that could start firing on 60 I'll be fixing this for real this release, but I don't want to be triggering asserts for everyone. MozReview-Commit-ID: 1UhsCYiGtNp
toolkit/components/resistfingerprinting/nsRFPService.cpp
--- a/toolkit/components/resistfingerprinting/nsRFPService.cpp
+++ b/toolkit/components/resistfingerprinting/nsRFPService.cpp
@@ -267,20 +267,21 @@ nsRFPService::GetSpoofedUserAgent(nsACSt
 
   nsAutoCString updateChannel;
   rv = runtime->GetDefaultUpdateChannel(updateChannel);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // If we are running in Firefox ESR, determine whether the formula of ESR
   // version has changed.  Once changed, we must update the formula in this
   // function.
-  if (updateChannel.EqualsLiteral("esr")) {
-    MOZ_ASSERT(((firefoxVersion % 7) == 3),
-      "Please udpate ESR version formula in nsRFPService.cpp");
-  }
+  // TODO: tjr Will be fixed very soon. See Bug 1432031 and related
+  //if (updateChannel.EqualsLiteral("esr")) {
+    //MOZ_ASSERT(((firefoxVersion % 7) == 3),
+    //  "Please udpate ESR version formula in nsRFPService.cpp");
+  //}
 
   uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 3) % 7);
   userAgent.Assign(nsPrintfCString(
     "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0",
     SPOOFED_UA_OS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion));
 
   return rv;
 }