Changeset 86101 in webkit

Timestamp:

May 9, 2011 4:08:15 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-09 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

Crash when sending a sync message to a crashed web process
​https://bugs.webkit.org/show_bug.cgi?id=60514
<rdar://problem/9281270>

Change WebProcessProxy::sendSync to return false if there's no connection.

Audit all WebProcessProxy::sendSync call sites to initialize reply parameters.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::firstRectForCharacterInSelectedRange): (WebKit::WebPageProxy::getSelectedText): (WebKit::WebPageProxy::gestureWillBegin):
• UIProcess/WebProcessProxy.h: (WebKit::WebProcessProxy::sendSync):
• UIProcess/mac/WebPageProxyMac.mm: (WebKit::WebPageProxy::insertText): (WebKit::WebPageProxy::getMarkedRange): (WebKit::WebPageProxy::getSelectedRange): (WebKit::WebPageProxy::characterIndexForPoint): (WebKit::WebPageProxy::executeKeypressCommands): (WebKit::WebPageProxy::writeSelectionToPasteboard): (WebKit::WebPageProxy::readSelectionFromPasteboard):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (3 diffs)
• UIProcess/WebProcessProxy.h (modified) (1 diff)
• UIProcess/mac/WebPageProxyMac.mm (modified) (7 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-09  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Crash when sending a sync message to a crashed web process
+        https://bugs.webkit.org/show_bug.cgi?id=60514
+        <rdar://problem/9281270>
+
+        Change WebProcessProxy::sendSync to return false if there's no connection.
+
+        Audit all WebProcessProxy::sendSync call sites to initialize reply parameters.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::firstRectForCharacterInSelectedRange):
+        (WebKit::WebPageProxy::getSelectedText):
+        (WebKit::WebPageProxy::gestureWillBegin):
+        * UIProcess/WebProcessProxy.h:
+        (WebKit::WebProcessProxy::sendSync):
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::insertText):
+        (WebKit::WebPageProxy::getMarkedRange):
+        (WebKit::WebPageProxy::getSelectedRange):
+        (WebKit::WebPageProxy::characterIndexForPoint):
+        (WebKit::WebPageProxy::executeKeypressCommands):
+        (WebKit::WebPageProxy::writeSelectionToPasteboard):
+        (WebKit::WebPageProxy::readSelectionFromPasteboard):
+
 2011-05-09  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -684 +684 @@
 IntRect WebPageProxy::firstRectForCharacterInSelectedRange(int characterPosition)
 {
-    if (!isValid())
-        return IntRect();
-
     IntRect resultRect;
     process()->sendSync(Messages::WebPage::FirstRectForCharacterInSelectedRange(characterPosition), Messages::WebPage::FirstRectForCharacterInSelectedRange::Reply(resultRect), m_pageID);
@@ -694 +691 @@
 String WebPageProxy::getSelectedText()
 {
-    if (!isValid())
-        return String();
-
     String text;
     process()->sendSync(Messages::WebPage::GetSelectedText(), Messages::WebPage::GetSelectedText::Reply(text), m_pageID);
@@ -704 +698 @@
 bool WebPageProxy::gestureWillBegin(const IntPoint& point)
 {
-    if (!isValid())
-        return false;
-
     bool canBeginPanning = false;
     process()->sendSync(Messages::WebPage::GestureWillBegin(point), Messages::WebPage::GestureWillBegin::Reply(canBeginPanning), m_pageID);

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -188 +188 @@
 bool WebProcessProxy::sendSync(const U& message, const typename U::Reply& reply, uint64_t destinationID, double timeout)
 {
+    if (!m_connection)
+        return false;
+
     return m_connection->sendSync(message, reply, destinationID, timeout);
 }

trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

@@ -174 +174 @@
         return true;
 
-    bool handled;
+    bool handled = true;
     process()->sendSync(Messages::WebPage::InsertText(text, replacementRangeStart, replacementRangeEnd), Messages::WebPage::InsertText::Reply(handled, m_editorState), m_pageID);
     return handled;
@@ -181 +181 @@
 void WebPageProxy::getMarkedRange(uint64_t& location, uint64_t& length)
 {
-    if (!isValid()) {
-        location = NSNotFound;
-        length = 0;
-        return;
-    }
+    location = NSNotFound;
+    length = 0;
+
+    if (!isValid())
+        return;
+
     process()->sendSync(Messages::WebPage::GetMarkedRange(), Messages::WebPage::GetMarkedRange::Reply(location, length), m_pageID);
 }
@@ -191 +192 @@
 void WebPageProxy::getSelectedRange(uint64_t& location, uint64_t& length)
 {
-    if (!isValid()) {
-        location = NSNotFound;
-        length = 0;
-        return;
-    }
+    location = NSNotFound;
+    length = 0;
+
+    if (!isValid())
+        return;
+
     process()->sendSync(Messages::WebPage::GetSelectedRange(), Messages::WebPage::GetSelectedRange::Reply(location, length), m_pageID);
 }
@@ -211 +213 @@
         return 0;
 
-    uint64_t result;
+    uint64_t result = 0;
     process()->sendSync(Messages::WebPage::CharacterIndexForPoint(point), Messages::WebPage::CharacterIndexForPoint::Reply(result), m_pageID);
     return result;
@@ -231 +233 @@
         return false;
 
-    bool result;
+    bool result = false;
     process()->sendSync(Messages::WebPage::ExecuteKeypressCommands(commands), Messages::WebPage::ExecuteKeypressCommands::Reply(result, m_editorState), m_pageID);
     return result;
@@ -241 +243 @@
         return false;
 
-    bool result;
+    bool result = false;
     const double messageTimeout = 20;
     process()->sendSync(Messages::WebPage::WriteSelectionToPasteboard(pasteboardName, pasteboardTypes), Messages::WebPage::WriteSelectionToPasteboard::Reply(result), m_pageID, messageTimeout);
@@ -252 +254 @@
         return false;
 
-    bool result;
+    bool result = false;
     const double messageTimeout = 20;
     process()->sendSync(Messages::WebPage::ReadSelectionFromPasteboard(pasteboardName), Messages::WebPage::ReadSelectionFromPasteboard::Reply(result), m_pageID, messageTimeout);