Changeset 32282 in webkit

Timestamp:

Apr 20, 2008 1:48:55 PM (16 years ago)

Author:

pewtermoose@webkit.org

Message:

2008-04-20 Matt Lilek <​webkit@mattlilek.com>

Mysteriously reviewed by mitz|away.

Bug 18111: Closing a tab while dragging crashes Safari
​https://bugs.webkit.org/show_bug.cgi?id=18111

Null check the page before handling drag events.

• WebView/WebView.mm: (-[WebView draggingUpdated:]): (-[WebView draggingExited:]):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (3 diffs)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2008-04-20  Matt Lilek  <webkit@mattlilek.com>
+
+        Mysteriously reviewed by mitz|away.
+
+        Bug 18111: Closing a tab while dragging crashes Safari
+        https://bugs.webkit.org/show_bug.cgi?id=18111
+
+        Null check the page before handling drag events.
+
+        * WebView/WebView.mm:
+        (-[WebView draggingUpdated:]):
+        (-[WebView draggingExited:]):
+
 2008-04-19  Brady Eidson  <beidson@apple.com>
 

trunk/WebKit/mac/WebView/WebView.mm

@@ -2503 +2503 @@
 - (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)draggingInfo
 {
+    Page* page = core(self);
+    if (!page)
+        return NSDragOperationNone;
+
     NSView <WebDocumentView>* view = [self documentViewAtWindowPoint:[draggingInfo draggingLocation]];
     WebPasteboardHelper helper([view isKindOfClass:[WebHTMLView class]] ? (WebHTMLView*)view : nil);
@@ -2508 +2512 @@
     IntPoint global(globalPoint([draggingInfo draggingLocation], [self window]));
     DragData dragData(draggingInfo, client, global, (DragOperation)[draggingInfo draggingSourceOperationMask], &helper);
-    return core(self)->dragController()->dragUpdated(&dragData);
+    return page->dragController()->dragUpdated(&dragData);
 }
 
 - (void)draggingExited:(id <NSDraggingInfo>)draggingInfo
 {
+    Page* page = core(self);
+    if (!page)
+        return;
+
     NSView <WebDocumentView>* view = [self documentViewAtWindowPoint:[draggingInfo draggingLocation]];
     WebPasteboardHelper helper([view isKindOfClass:[WebHTMLView class]] ? (WebHTMLView*)view : nil);
@@ -2518 +2526 @@
     IntPoint global(globalPoint([draggingInfo draggingLocation], [self window]));
     DragData dragData(draggingInfo, client, global, (DragOperation)[draggingInfo draggingSourceOperationMask], &helper);
-    core(self)->dragController()->dragExited(&dragData);
+    page->dragController()->dragExited(&dragData);
 }