Changeset 56423 in webkit

Timestamp:

Mar 23, 2010 3:40:14 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-23 Anders Bakken <​anders.bakken@nokia.com>, Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Check if q->scene() is available before actually using it
on QGraphicsWebViewPrivate.

QGraphicsWebView crash
​https://bugs.webkit.org/show_bug.cgi?id=32670

• Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::screenNumber): (QGraphicsWebViewPrivate::ownerWidget):

Location:

trunk/WebKit/qt

Files:

• Api/qgraphicswebview.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -328 +328 @@
 {
 #if defined(Q_WS_X11)
-    const QList<QGraphicsView*> views = q->scene()->views();
-
-    if (!views.isEmpty())
-        return views.at(0)->x11Info().screen();
+    if (QGraphicsScene* scene = q->scene()) {
+        const QList<QGraphicsView*> views = scene->views();
+
+        if (!views.isEmpty())
+            return views.at(0)->x11Info().screen();
+    }
 #endif
 
@@ -339 +341 @@
 QWidget* QGraphicsWebViewPrivate::ownerWidget() const
 {
-    const QList<QGraphicsView*> views = q->scene()->views();
-    return views.value(0);
+    if (QGraphicsScene* scene = q->scene()) {
+        const QList<QGraphicsView*> views = scene->views();
+        return views.value(0);
+    }
+    return 0;
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-03-23  Anders Bakken <anders.bakken@nokia.com>, Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Check if q->scene() is available before actually using it
+        on QGraphicsWebViewPrivate.
+
+        QGraphicsWebView crash
+        https://bugs.webkit.org/show_bug.cgi?id=32670
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::screenNumber):
+        (QGraphicsWebViewPrivate::ownerWidget):
+
 2010-03-23  David Leong  <david.leong@nokia.com>