Changeset 23552 in webkit

Timestamp:

Jun 15, 2007 2:17:47 PM (17 years ago)

Author:

andersca

Message:

Reviewed by Kevin.

<rdar://problem/5271774> REGRESSION: A crash occurs when closing a window that contains a QT movie

In some cases, calling [super dealloc] might end up calling visibleRect, so make sure to
set _element to 0 so we won't send a message to a freed object and crash.

• Plugins/WebKitPluginContainerView.mm: (-[WebKitPluginContainerView dealloc]): (-[WebKitPluginContainerView visibleRect]):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebKitPluginContainerView.mm (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-06-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Kevin.
+
+        <rdar://problem/5271774> REGRESSION: A crash occurs when closing a window that contains a QT movie
+        
+        In some cases, calling [super dealloc] might end up calling visibleRect, so make sure to
+        set _element to 0 so we won't send a message to a freed object and crash.
+        
+        * Plugins/WebKitPluginContainerView.mm:
+        (-[WebKitPluginContainerView dealloc]):
+        (-[WebKitPluginContainerView visibleRect]):
+
 2007-06-14  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/Plugins/WebKitPluginContainerView.mm

@@ -45 +45 @@
 {
     [_element release];
+    
+    // Calling [super dealloc] can end up calling visibleRect so we need to set
+    // the _element instance to 0 here so we can check for it in our visibleRect.
+    _element = 0;
+    
     [super dealloc];
 }
@@ -50 +55 @@
 - (NSRect)visibleRect
 {
+    if (!_element)
+        return [super visibleRect];
+    
     // WebCore may impose an additional clip (via CSS overflow or clip properties).  Fetch
     // that clip now.