Changeset 184258 in webkit

Timestamp:

May 12, 2015, 9:38:39 PM (10 years ago)

Author:

mitz@apple.com

Message:

In Safari, Debug > Get Bytecode Profile crashes the Web Content process
​https://bugs.webkit.org/show_bug.cgi?id=144944

Reviewed by Darin Adler.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::getBytecodeProfile): Don’t assert that m_perBytecodeProfiler isn’t null,
because it is when the profiler is disabled, which is the default. In that case, return
after sending back the empty string, rather than continuing to dereference a null pointer.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-05-12  Dan Bernstein  <mitz@apple.com>
+
+        In Safari, Debug > Get Bytecode Profile crashes the Web Content process
+        https://bugs.webkit.org/show_bug.cgi?id=144944
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::getBytecodeProfile): Don’t assert that m_perBytecodeProfiler isn’t null,
+        because it is when the profiler is disabled, which is the default. In that case, return
+        after sending back the empty string, rather than continuing to dereference a null pointer.
+
 2015-05-12  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4859 +4859 @@
 void WebPage::getBytecodeProfile(uint64_t callbackID)
 {
-    ASSERT(JSDOMWindow::commonVM().m_perBytecodeProfiler);
-    if (!JSDOMWindow::commonVM().m_perBytecodeProfiler)
+    if (!JSDOMWindow::commonVM().m_perBytecodeProfiler) {
         send(Messages::WebPageProxy::StringCallback(String(), callbackID));
+        return;
+    }
+
     String result = JSDOMWindow::commonVM().m_perBytecodeProfiler->toJSON();
     ASSERT(result.length());