Changeset 77104 in webkit

Timestamp:

Jan 30, 2011 8:06:43 PM (13 years ago)

Author:

ggaren@apple.com

Message:

2011-01-30 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Sam Weinig.

[Take 2!]
Fixed crash on window close (maybe crash on launch?) due to missing frame null checks
​https://bugs.webkit.org/show_bug.cgi?id=53408

• UIProcess/WebContext.cpp: (WebKit::WebContext::didNavigateWithNavigationData): (WebKit::WebContext::didPerformClientRedirect): (WebKit::WebContext::didPerformServerRedirect): (WebKit::WebContext::didUpdateHistoryTitle): Use MESSAGE_CHECK because we don't think we should be able to reach this state under normal conditions.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-30  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        [Take 2!]
+        Fixed crash on window close (maybe crash on launch?) due to missing frame null checks
+        https://bugs.webkit.org/show_bug.cgi?id=53408
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::didNavigateWithNavigationData):
+        (WebKit::WebContext::didPerformClientRedirect):
+        (WebKit::WebContext::didPerformServerRedirect):
+        (WebKit::WebContext::didUpdateHistoryTitle): Use MESSAGE_CHECK because
+        we don't think we should be able to reach this state under normal conditions.
+
 2011-01-30  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -53 +53 @@
 #endif
 
+#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, process()->connection())
+
 using namespace WebCore;
 
@@ -300 +302 @@
 {
     WebFrameProxy* frame = m_process->webFrame(frameID);
-    if (!frame || !frame->page())
+    MESSAGE_CHECK(frame);
+    if (!frame->page())
         return;
     
@@ -309 +312 @@
 {
     WebFrameProxy* frame = m_process->webFrame(frameID);
-    if (!frame || !frame->page())
+    MESSAGE_CHECK(frame);
+    if (!frame->page())
         return;
     
@@ -318 +322 @@
 {
     WebFrameProxy* frame = m_process->webFrame(frameID);
-    if (!frame || !frame->page())
+    MESSAGE_CHECK(frame);
+    if (!frame->page())
         return;
     
@@ -327 +332 @@
 {
     WebFrameProxy* frame = m_process->webFrame(frameID);
-    if (!frame || !frame->page())
+    MESSAGE_CHECK(frame);
+    if (!frame->page())
         return;