Changeset 133727 in webkit

Timestamp:

Nov 7, 2012 12:32:34 AM (11 years ago)

Author:

yurys@chromium.org

Message:

Console not displaying all properties of an Object once native Constructor overwritten
​https://bugs.webkit.org/show_bug.cgi?id=101320

Reviewed by Pavel Feldman.

Source/WebCore:

Use Object instance from {}.constructor when formatting inspector messages in the
injected script. Otherwise inspected page may overwrite Object value and break inspector.

Test: inspector/console/console-Object-overwritten.html

• inspector/InjectedScriptSource.js:

LayoutTests:

Check that Web Inspector's console works fine if Object is overwritten in the inspected
page.

• inspector/console/console-Object-overwritten-expected.txt: Added.
• inspector/console/console-Object-overwritten.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/console/command-line-api-expected.txt (modified) (1 diff)
• LayoutTests/inspector/console/console-Object-overwritten-expected.txt (added)
• LayoutTests/inspector/console/console-Object-overwritten.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InjectedScriptSource.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-06  Yury Semikhatsky  <yurys@chromium.org>
+
+        Console not displaying all properties of an Object once native Constructor overwritten
+        https://bugs.webkit.org/show_bug.cgi?id=101320
+
+        Reviewed by Pavel Feldman.
+
+        Check that Web Inspector's console works fine if Object is overwritten in the inspected
+        page.
+
+        * inspector/console/console-Object-overwritten-expected.txt: Added.
+        * inspector/console/console-Object-overwritten.html: Added.
+
 2012-11-06  Kangil Han  <kangil.han@samsung.com>
 

trunk/LayoutTests/inspector/console/command-line-api-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: line 1028: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
+CONSOLE MESSAGE: line 1031: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
 Tests that command line api works.
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-06  Yury Semikhatsky  <yurys@chromium.org>
+
+        Console not displaying all properties of an Object once native Constructor overwritten
+        https://bugs.webkit.org/show_bug.cgi?id=101320
+
+        Reviewed by Pavel Feldman.
+
+        Use Object instance from {}.constructor when formatting inspector messages in the
+        injected script. Otherwise inspected page may overwrite Object value and break inspector.
+
+        Test: inspector/console/console-Object-overwritten.html
+
+        * inspector/InjectedScriptSource.js:
+
 2012-11-06  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -34 +34 @@
 (function (InjectedScriptHost, inspectedWindow, injectedScriptId) {
 
+// Protect against Object overwritten by the user code.
+var Object = {}.constructor;
+
 /**
  * @param {Arguments} array