[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fee5dffbc300167cfb886c91499bcf37fbd5ba10
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 22:14:07 2010 +0000

    2010-10-21  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Chris Fleizach.
    
            [GTK] Segfault while testing accessibility/iframe-bastardization.html
            https://bugs.webkit.org/show_bug.cgi?id=30123
    
            Check m_element before actually using it to get the parent.
    
            * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
            (AccessibilityUIElement::parentElement): Add an extra check to
            make sure m_element points to a valid value before actually using
            it to get the parent. Also, assert ATK_IS_OBJECT(m_element).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 36ccd4e..7dcf428 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-21  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Chris Fleizach.
+
+        [GTK] Segfault while testing accessibility/iframe-bastardization.html
+        https://bugs.webkit.org/show_bug.cgi?id=30123
+
+        Check m_element before actually using it to get the parent.
+
+        * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
+        (AccessibilityUIElement::parentElement): Add an extra check to
+        make sure m_element points to a valid value before actually using
+        it to get the parent. Also, assert ATK_IS_OBJECT(m_element).
+
 2010-10-21  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp b/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
index d39ff1e..8493f1a 100644
--- a/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
@@ -174,9 +174,12 @@ AccessibilityUIElement AccessibilityUIElement::titleUIElement()
 
 AccessibilityUIElement AccessibilityUIElement::parentElement()
 {
-    ASSERT(m_element);
-    AtkObject* parent =  atk_object_get_parent(ATK_OBJECT(m_element));
+    if (!m_element)
+        return 0;
 
+    ASSERT(ATK_IS_OBJECT(m_element));
+
+    AtkObject* parent =  atk_object_get_parent(ATK_OBJECT(m_element));
     return parent ? AccessibilityUIElement(parent) : 0;
 }
 

-- 
WebKit Debian packaging