Changeset 259564 in webkit

Timestamp:

Apr 5, 2020, 9:34:36 PM (6 years ago)

Author:

Ross Kirsling

Message:

JSC shell shouldn't treat NUL as a terminator when printing a JS string
​https://bugs.webkit.org/show_bug.cgi?id=210037

Reviewed by Darin Adler.

JSTests:

• .gitattributes:
• ChakraCore.yaml:
• ChakraCore/test/es5/hasItem.baseline-jsc: Added.

Update baseline and mark it diffable (as plaintext) in spite of containing \0.

Source/JavaScriptCore:

Since JS strings aren't null-terminated, it's probably a better experience to not stop printing when we see \0.
That is, 'abc\0def' should be printed as abcdef and not abc.

This patch updates our printing of evaluation results as well as the print / printErr / debug functions.

• jsc.cpp:

(printInternal):
(functionDebug):
(runInteractive):

Location:

trunk

Files:

• JSTests/.gitattributes (modified) (1 diff)
• JSTests/ChakraCore.yaml (modified) (1 diff)
• JSTests/ChakraCore/test/es5/hasItem.baseline-jsc (added)
• JSTests/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jsc.cpp (modified) (3 diffs)

trunk/JSTests/.gitattributes

@@ +1 @@
+ChakraCore/test/es5/hasItem.baseline-jsc diff
+
 test262/test/language/expressions/logical-assignment/lgcl-and-whitespace.js svn-properties=allow-tabs=on
 test262/test/language/expressions/logical-assignment/lgcl-or-whitespace.js svn-properties=allow-tabs=on

trunk/JSTests/ChakraCore.yaml

@@ -1470 +1470 @@
   cmd: runChakra :baseline, "NoException", "enumerable.baseline-jsc", []
 - path: ChakraCore/test/es5/hasItem.js
-  cmd: runChakra :baseline, "NoException", "hasItem.baseline", []
+  cmd: runChakra :baseline, "NoException", "hasItem.baseline-jsc", []
 - path: ChakraCore/test/es5/regexSpace.js
   cmd: runChakra :baseline, "NoException", "regexSpace.baseline", []

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-04-05  Ross Kirsling  <ross.kirsling@sony.com>
+
+        JSC shell shouldn't treat NUL as a terminator when printing a JS string
+        https://bugs.webkit.org/show_bug.cgi?id=210037
+
+        Reviewed by Darin Adler.
+
+        * .gitattributes:
+        * ChakraCore.yaml:
+        * ChakraCore/test/es5/hasItem.baseline-jsc: Added.
+        Update baseline and mark it diffable (as plaintext) in spite of containing \0.
+
 2020-04-05  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-04-05  Ross Kirsling  <ross.kirsling@sony.com>
+
+        JSC shell shouldn't treat NUL as a terminator when printing a JS string
+        https://bugs.webkit.org/show_bug.cgi?id=210037
+
+        Reviewed by Darin Adler.
+
+        Since JS strings aren't null-terminated, it's probably a better experience to not stop printing when we see \0.
+        That is, 'abc\0def' should be printed as `abcdef` and not `abc`.
+
+        This patch updates our printing of evaluation results as well as the print / printErr / debug functions.
+
+        * jsc.cpp:
+        (printInternal):
+        (functionDebug):
+        (runInteractive):
+
 2020-04-05  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -1269 +1269 @@
         auto string = cStringFromViewWithString(globalObject, scope, viewWithString);
         RETURN_IF_EXCEPTION(scope, encodedJSValue());
-        if (fprintf(out, "%s", string.data()) < 0)
+        fwrite(string.data(), sizeof(char), string.length(), out);
+        if (ferror(out))
             goto fail;
     }
@@ -1290 +1291 @@
     auto string = cStringFromViewWithString(globalObject, scope, viewWithString);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
-    fprintf(stderr, "--> %s\n", string.data());
+    fputs("--> ", stderr);
+    fwrite(string.data(), sizeof(char), string.length(), stderr);
+    fputc('\n', stderr);
     return JSValue::encode(jsUndefined());
 }
@@ -2796 +2799 @@
         JSValue returnValue = evaluate(globalObject, jscSource(line, sourceOrigin, sourceOrigin.string()), JSValue(), evaluationException);
 #endif
-        if (evaluationException)
-            printf("Exception: %s\n", evaluationException->value().toWTFString(globalObject).utf8().data());
-        else
-            printf("%s\n", returnValue.toWTFString(globalObject).utf8().data());
+        CString result;
+        if (evaluationException) {
+            fputs("Exception: ", stdout);
+            result = evaluationException->value().toWTFString(globalObject).utf8();
+        } else
+            result = returnValue.toWTFString(globalObject).utf8();
+        fwrite(result.data(), sizeof(char), result.length(), stdout);
+        putchar('\n');
 
         scope.clearException();