Changeset 194590 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Jan 5, 2016, 11:03:07 AM (9 years ago)

Author:

[email protected]

Message:

Add validation of JSC options to catch typos.
​https://bugs.webkit.org/show_bug.cgi?id=152549

Reviewed by Benjamin Poulain.

1. If a JSC_xxx option is found and xxx is not a valid option, we will now log an error message.
2. The jsc app is commonly used as follows:

$ jsc [jsc options] [scripts]

Previously, we'll continue to parse for [jsc options] after [scripts] is seen.
We won't do this anymore. Any --xxx jsc options must precede the [scripts]
arguments.

3. If a --xxx jsc option is specified, but xxx is not a valid option, we will now log an error message.

4. Added JSC_validateOptions, which if set to true will cause the VM to crash if an invalid option was seen during options parsing.

• jsc.cpp:

(CommandLine::parseArguments):

• runtime/Options.cpp:

(JSC::Options::initialize):

• runtime/Options.h:

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -1890 +1890 @@
     bool needToExit = false;
 
+    bool doneWithJSCOptions = false;
+    bool hasBadJSCOptions = false;
     for (; i < argc; ++i) {
         const char* arg = argv[i];
-        if (!strcmp(arg, "-f")) {
-            if (++i == argc)
-                printUsageStatement();
-            m_scripts.append(Script(true, argv[i]));
-            continue;
-        }
-        if (!strcmp(arg, "-e")) {
-            if (++i == argc)
-                printUsageStatement();
-            m_scripts.append(Script(false, argv[i]));
-            continue;
-        }
-        if (!strcmp(arg, "-i")) {
-            m_interactive = true;
-            continue;
-        }
-        if (!strcmp(arg, "-d")) {
-            m_dump = true;
-            continue;
-        }
-        if (!strcmp(arg, "-p")) {
-            if (++i == argc)
-                printUsageStatement();
-            m_profile = true;
-            m_profilerOutput = argv[i];
-            continue;
-        }
-        if (!strcmp(arg, "-m")) {
-            m_module = true;
-            continue;
-        }
-        if (!strcmp(arg, "-s")) {
+
+        if (!doneWithJSCOptions) {
+            if (!strcmp(arg, "-f")) {
+                if (++i == argc)
+                    printUsageStatement();
+                m_scripts.append(Script(true, argv[i]));
+                continue;
+            }
+            if (!strcmp(arg, "-e")) {
+                if (++i == argc)
+                    printUsageStatement();
+                m_scripts.append(Script(false, argv[i]));
+                continue;
+            }
+            if (!strcmp(arg, "-i")) {
+                m_interactive = true;
+                continue;
+            }
+            if (!strcmp(arg, "-d")) {
+                m_dump = true;
+                continue;
+            }
+            if (!strcmp(arg, "-p")) {
+                if (++i == argc)
+                    printUsageStatement();
+                m_profile = true;
+                m_profilerOutput = argv[i];
+                continue;
+            }
+            if (!strcmp(arg, "-m")) {
+                m_module = true;
+                continue;
+            }
+            if (!strcmp(arg, "-s")) {
 #if HAVE(SIGNAL_H)
-            signal(SIGILL, _exit);
-            signal(SIGFPE, _exit);
-            signal(SIGBUS, _exit);
-            signal(SIGSEGV, _exit);
-#endif
-            continue;
-        }
-        if (!strcmp(arg, "-x")) {
-            m_exitCode = true;
-            continue;
-        }
-        if (!strcmp(arg, "--")) {
-            ++i;
-            break;
-        }
-        if (!strcmp(arg, "-h") || !strcmp(arg, "--help"))
-            printUsageStatement(true);
-
-        if (!strcmp(arg, "--options")) {
-            needToDumpOptions = true;
-            needToExit = true;
-            continue;
-        }
-        if (!strcmp(arg, "--dumpOptions")) {
-            needToDumpOptions = true;
-            continue;
-        }
-
-        // See if the -- option is a JSC VM option.
-        if (strstr(arg, "--") == arg && JSC::Options::setOption(&arg[2])) {
-            // The arg was recognized as a VM option and has been parsed.
-            continue; // Just continue with the next arg. 
-        }
+                signal(SIGILL, _exit);
+                signal(SIGFPE, _exit);
+                signal(SIGBUS, _exit);
+                signal(SIGSEGV, _exit);
+#endif
+                continue;
+            }
+            if (!strcmp(arg, "-x")) {
+                m_exitCode = true;
+                continue;
+            }
+            if (!strcmp(arg, "--")) {
+                ++i;
+                break;
+            }
+            if (!strcmp(arg, "-h") || !strcmp(arg, "--help"))
+                printUsageStatement(true);
+
+            if (!strcmp(arg, "--options")) {
+                needToDumpOptions = true;
+                needToExit = true;
+                continue;
+            }
+            if (!strcmp(arg, "--dumpOptions")) {
+                needToDumpOptions = true;
+                continue;
+            }
+
+            // See if the -- option is a JSC VM option.
+            if (strstr(arg, "--") == arg) {
+                if (!JSC::Options::setOption(&arg[2])) {
+                    hasBadJSCOptions = true;
+                    dataLog("ERROR: invalid option: ", arg, "\n");
+                }
+                continue;
+            }
+
+            doneWithJSCOptions = true;
+
+        } // !doneWithJSCOptions
 
         // This arg is not recognized by the VM nor by jsc. Pass it on to the
@@ -1963 +1974 @@
         m_scripts.append(Script(true, argv[i]));
     }
+
+    if (hasBadJSCOptions && JSC::Options::validateOptions())
+        CRASH();
 
     if (m_scripts.isEmpty())