Changeset 242852 in webkit

Timestamp:

Mar 13, 2019, 1:24:23 AM (7 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r241615. rdar://problem/48839366

SamplingProfiler::stackTracesAsJSON() should escape strings.
​https://bugs.webkit.org/show_bug.cgi?id=194649
<rdar://problem/48072386>

Reviewed by Saam Barati.

JSTests:

• stress/sampling-profiler-stack-trace-with-double-quote-in-function-name.js: Added.
• stress/type-profiler-with-double-quote-in-constructor-name.js: Added.
• stress/type-profiler-with-double-quote-in-field-name.js: Added.
• stress/type-profiler-with-double-quote-in-optional-field-name.js: Added.

Source/JavaScriptCore:

Ditto for TypeSet::toJSONString() and TypeSet::toJSONString().

• runtime/SamplingProfiler.cpp: (JSC::SamplingProfiler::stackTracesAsJSON):
• runtime/TypeSet.cpp: (JSC::TypeSet::toJSONString const): (JSC::StructureShape::toJSONString const):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@241615 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607-branch

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/sampling-profiler-stack-trace-with-double-quote-in-function-name.js (added)
• JSTests/stress/type-profiler-with-double-quote-in-constructor-name.js (added)
• JSTests/stress/type-profiler-with-double-quote-in-field-name.js (added)
• JSTests/stress/type-profiler-with-double-quote-in-optional-field-name.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/SamplingProfiler.cpp (modified) (2 diffs)
• Source/JavaScriptCore/runtime/TypeSet.cpp (modified) (5 diffs)

branches/safari-607-branch/JSTests/ChangeLog

@@ +1 @@
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r241615. rdar://problem/48839366
+
+    SamplingProfiler::stackTracesAsJSON() should escape strings.
+    https://bugs.webkit.org/show_bug.cgi?id=194649
+    <rdar://problem/48072386>
+    
+    Reviewed by Saam Barati.
+    
+    JSTests:
+    
+    * stress/sampling-profiler-stack-trace-with-double-quote-in-function-name.js: Added.
+    * stress/type-profiler-with-double-quote-in-constructor-name.js: Added.
+    * stress/type-profiler-with-double-quote-in-field-name.js: Added.
+    * stress/type-profiler-with-double-quote-in-optional-field-name.js: Added.
+    
+    Source/JavaScriptCore:
+    
+    Ditto for TypeSet::toJSONString() and TypeSet::toJSONString().
+    
+    * runtime/SamplingProfiler.cpp:
+    (JSC::SamplingProfiler::stackTracesAsJSON):
+    * runtime/TypeSet.cpp:
+    (JSC::TypeSet::toJSONString const):
+    (JSC::StructureShape::toJSONString const):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241615 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-02-15  Mark Lam  <mark.lam@apple.com>
+
+            SamplingProfiler::stackTracesAsJSON() should escape strings.
+            https://bugs.webkit.org/show_bug.cgi?id=194649
+            <rdar://problem/48072386>
+
+            Reviewed by Saam Barati.
+
+            * stress/sampling-profiler-stack-trace-with-double-quote-in-function-name.js: Added.
+            * stress/type-profiler-with-double-quote-in-constructor-name.js: Added.
+            * stress/type-profiler-with-double-quote-in-field-name.js: Added.
+            * stress/type-profiler-with-double-quote-in-optional-field-name.js: Added.
+
 2019-02-20  Alan Coon  <alancoon@apple.com>
 

branches/safari-607-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r241615. rdar://problem/48839366
+
+    SamplingProfiler::stackTracesAsJSON() should escape strings.
+    https://bugs.webkit.org/show_bug.cgi?id=194649
+    <rdar://problem/48072386>
+    
+    Reviewed by Saam Barati.
+    
+    JSTests:
+    
+    * stress/sampling-profiler-stack-trace-with-double-quote-in-function-name.js: Added.
+    * stress/type-profiler-with-double-quote-in-constructor-name.js: Added.
+    * stress/type-profiler-with-double-quote-in-field-name.js: Added.
+    * stress/type-profiler-with-double-quote-in-optional-field-name.js: Added.
+    
+    Source/JavaScriptCore:
+    
+    Ditto for TypeSet::toJSONString() and TypeSet::toJSONString().
+    
+    * runtime/SamplingProfiler.cpp:
+    (JSC::SamplingProfiler::stackTracesAsJSON):
+    * runtime/TypeSet.cpp:
+    (JSC::TypeSet::toJSONString const):
+    (JSC::StructureShape::toJSONString const):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241615 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-02-15  Mark Lam  <mark.lam@apple.com>
+
+            SamplingProfiler::stackTracesAsJSON() should escape strings.
+            https://bugs.webkit.org/show_bug.cgi?id=194649
+            <rdar://problem/48072386>
+
+            Reviewed by Saam Barati.
+
+            Ditto for TypeSet::toJSONString() and TypeSet::toJSONString().
+
+            * runtime/SamplingProfiler.cpp:
+            (JSC::SamplingProfiler::stackTracesAsJSON):
+            * runtime/TypeSet.cpp:
+            (JSC::TypeSet::toJSONString const):
+            (JSC::StructureShape::toJSONString const):
+
 2019-02-28  Andy Estes  <aestes@apple.com>
 

branches/safari-607-branch/Source/JavaScriptCore/runtime/SamplingProfiler.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2016-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -904 +904 @@
         for (StackFrame& stackFrame : stackTrace.frames) {
             comma();
-            json.append('"');
-            json.append(stackFrame.displayNameForJSONTests(m_vm));
-            json.append('"');
+            json.appendQuotedJSONString(stackFrame.displayNameForJSONTests(m_vm));
             loopedOnce = true;
         }

branches/safari-607-branch/Source/JavaScriptCore/runtime/TypeSet.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2014, 2015 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2014-2019 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -254 +254 @@
 
     json.appendLiteral("\"displayTypeName\":");
-    json.append('"');
-    json.append(displayName());
-    json.append('"');
+    json.appendQuotedJSONString(displayName());
     json.append(',');
 
@@ -443 +441 @@
 
     json.appendLiteral("\"constructorName\":");
-    json.append('"');
-    json.append(m_constructorName);
-    json.append('"');
+    json.appendQuotedJSONString(m_constructorName);
     json.append(',');
 
@@ -464 +460 @@
 
         String fieldName((*it).get());
-        json.append('"');
-        json.append(fieldName);
-        json.append('"');
+        json.appendQuotedJSONString(fieldName);
     }
     json.append(']');
@@ -480 +474 @@
 
         String fieldName((*it).get());
-        json.append('"');
-        json.append(fieldName);
-        json.append('"');
+        json.appendQuotedJSONString(fieldName);
     }
     json.append(']');