Changeset 58035 in webkit

Timestamp:

Apr 21, 2010 6:30:00 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-21 David Leong <​david.leong@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Symbian apps crash on exit due to a bad qObject_cast.

​https://bugs.webkit.org/show_bug.cgi?id=37303

Added check for NULL to avoid the crash. Reworked to fix memory leak

• plugins/symbian/PluginViewSymbian.cpp: (WebCore::PluginView::platformDestroy):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/symbian/PluginViewSymbian.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-21  David Leong  <david.leong@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Symbian apps crash on exit due to a bad qObject_cast.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37303
+
+        Added check for NULL to avoid the crash. Reworked to fix memory leak
+           
+        * plugins/symbian/PluginViewSymbian.cpp:
+        (WebCore::PluginView::platformDestroy):
+
 2009-04-21  Chris Fleizach  <cfleizach@apple.com>
 

trunk/WebCore/plugins/symbian/PluginViewSymbian.cpp

@@ -415 +415 @@
 void PluginView::platformDestroy()
 {
-    QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient();
-    if (client && qobject_cast<QGraphicsWebView*>(client->pluginParent()))
-        delete static_cast<PluginContainerSymbian*>(platformPluginWidget())->proxy();
-    else
-        delete platformPluginWidget();
+    if (platformPluginWidget()) {
+        PluginContainerSymbian* container = static_cast<PluginContainerSymbian*>(platformPluginWidget());
+        delete container->proxy();
+        delete container;
+    }
 }