Changeset 234780 in webkit

Timestamp:

Aug 10, 2018 7:43:47 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: console.log fires getters for deep properties
​https://bugs.webkit.org/show_bug.cgi?id=187542
<rdar://problem/42873158>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2018-08-10
Reviewed by Saam Barati.

Source/JavaScriptCore:

• inspector/InjectedScriptSource.js:

(RemoteObject.prototype._isPreviewableObject):
Avoid getters/setters when checking for simple properties to preview.
Here we avoid invoking object[property] if it could be a user getter.

LayoutTests:

• inspector/injected-script/avoid-getter-invocation-expected.txt: Added.
• inspector/injected-script/avoid-getter-invocation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/injected-script/avoid-getter-invocation-expected.txt (added)
• LayoutTests/inspector/injected-script/avoid-getter-invocation.html (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/InjectedScriptSource.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-08-10  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: console.log fires getters for deep properties
+        https://bugs.webkit.org/show_bug.cgi?id=187542
+        <rdar://problem/42873158>
+
+        Reviewed by Saam Barati.
+
+        * inspector/injected-script/avoid-getter-invocation-expected.txt: Added.
+        * inspector/injected-script/avoid-getter-invocation.html: Added.
+
 2018-08-10  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-08-10  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: console.log fires getters for deep properties
+        https://bugs.webkit.org/show_bug.cgi?id=187542
+        <rdar://problem/42873158>
+
+        Reviewed by Saam Barati.
+
+        * inspector/InjectedScriptSource.js:
+        (RemoteObject.prototype._isPreviewableObject):
+        Avoid getters/setters when checking for simple properties to preview.
+        Here we avoid invoking `object[property]` if it could be a user getter.
+
 2018-08-10  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/inspector/InjectedScriptSource.js

@@ -1287 +1287 @@
             return false;
 
-        // Objects are simple if they have 3 or less simple properties.
+        // Objects are simple if they have 3 or less simple value properties.
         let ownPropertyNames = Object.getOwnPropertyNames(object);
         if (ownPropertyNames.length > 3)
@@ -1293 +1293 @@
         for (let i = 0; i < ownPropertyNames.length; ++i) {
             let propertyName = ownPropertyNames[i];
+            let descriptor = Object.getOwnPropertyDescriptor(object, propertyName);
+            if (descriptor && !("value" in descriptor))
+                return false;
             if (!this._isPreviewableObjectInternal(object[propertyName], knownObjects, depth))
                 return false;