mozilla-central: changeset 458912:9c47d4f6747a

author	Dave Townsend <dtownsend@oxymoronical.com>
	Wed, 13 Feb 2019 16:36:02 +0000
changeset 458912	9c47d4f6747a
parent 458911	6e651b1b00b1
child 458913	ac92eed544e9
push id	35551
push user	shindli@mozilla.com
push date	Wed, 13 Feb 2019 21:34:09 +0000
treeherder	mozilla-central@08f794a4928e [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bzbarsky
bugs	1527374
milestone	67.0a1
first release with	nightly linux32 08f794a4928e / 67.0a1 / 20190213213409 / files nightly linux64 08f794a4928e / 67.0a1 / 20190213213409 / files nightly mac 08f794a4928e / 67.0a1 / 20190213213409 / files nightly win32 08f794a4928e / 67.0a1 / 20190213213409 / files nightly win64 08f794a4928e / 67.0a1 / 20190213213409 / files
last release without	nightly linux32 0a9a4f8d79e9 / 67.0a1 / 20190213102848 / files nightly linux64 0a9a4f8d79e9 / 67.0a1 / 20190213102848 / files nightly mac 0a9a4f8d79e9 / 67.0a1 / 20190213102848 / files nightly win32 0a9a4f8d79e9 / 67.0a1 / 20190213102848 / files nightly win64 0a9a4f8d79e9 / 67.0a1 / 20190213102848 / files

Bug 1527374: Always remove --allow-downgrade from the command line. r=bzbarsky Currently we only check and remove the --allow-downgrade command line argument if the run is actually a downgrade. When we don't the --allow-downgrade argument makes it to Firefox's default command line handler which doesn't know how to handle it and so ignores it and the next argument on the command line. Flipping the ordering of the check makes sure we always remove the argument. Differential Revision: https://phabricator.services.mozilla.com/D19569

toolkit/xre/nsAppRunner.cpp

file | annotate | diff | comparison | revisions

--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -4235,17 +4235,19 @@ int XREMain::XRE_mainStartup(bool* aExit
   bool cachesOK;
   bool isDowngrade;
   nsCString lastVersion;
   bool versionOK = CheckCompatibility(
       mProfD, version, osABI, mDirProvider.GetGREDir(), mAppData->directory,
       flagFile, &cachesOK, &isDowngrade, lastVersion);
 
 #ifdef MOZ_BLOCK_PROFILE_DOWNGRADE
-  if (isDowngrade && !CheckArg("allow-downgrade")) {
+  // The argument check must come first so the argument is always removed from
+  // the command line regardless of whether this is a downgrade or not.
+  if (!CheckArg("allow-downgrade") && isDowngrade) {
     rv = CheckDowngrade(mProfD, mNativeApp, mProfileSvc, lastVersion);
     if (rv == NS_ERROR_LAUNCHED_CHILD_PROCESS || rv == NS_ERROR_ABORT) {
       *aExitFlag = true;
       return 0;
     }
   }
 #endif