@@ -93,6 +93,14 @@ def test_open_new_tab(self):
                    options=[],
                    arguments=[URL])
 
+    def test_reject_action_dash_prefixes(self):
+        browser = self.browser_class(name=CMD_NAME)
+        with self.assertRaises(ValueError):
+            browser.open('%action--incognito')
+        # new=1: action is "--new-window", so "%action" itself expands to
+        # a dash-prefixed flag even with no dash in the original URL.
+        with self.assertRaises(ValueError):
+            browser.open('%action', new=1)
 
 class MozillaCommandTest(CommandTestMixin, unittest.TestCase):
 
 
@@ -227,7 +227,6 @@ def _invoke(self, args, remote, autoraise):
             return not p.wait()
 
     def open(self, url, new=0, autoraise=True):
-        self._check_url(url)
         if new == 0:
             action = self.remote_action
         elif new == 1:
@@ -241,7 +240,9 @@ def open(self, url, new=0, autoraise=True):
             raise Error("Bad 'new' parameter to open(); " +
                         "expected 0, 1, or 2, got %s" % new)
 
-        args = [arg.replace("%s", url).replace("%action", action)
+        self._check_url(url.replace("%action", action))
+
+        args = [arg.replace("%action", action).replace("%s", url)
                 for arg in self.remote_args]
         args = [arg for arg in args if arg]
         success = self._invoke(args, True, autoraise)
 
@@ -0,0 +1,2 @@
+A bypass in :mod:`webbrowser` allowed URLs prefixed with ``%action`` to pass
+the dash-prefix safety check.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+A bypass in :mod:`webbrowser` allowed URLs prefixed with ``%action`` to pass
	`2`	`+the dash-prefix safety check.`