Title: [128286] releases/WebKitGTK/webkit-1.10/Source/WebCore
Revision
128286
Author
carlo...@webkit.org
Date
2012-09-12 02:58:42 -0700 (Wed, 12 Sep 2012)

Log Message

Merge r128074 - [GTK][a11y] editing/pasteboard/paste-blockquote-into-blockquote-4.html crashes
https://bugs.webkit.org/show_bug.cgi?id=96199

Patch by Joanmarie Diggs <jdi...@igalia.com> on 2012-09-10
Reviewed by Martin Robinson.

Added sanity check to correct erroneous assumption that there will
always be a child object.

No new tests as the bug crashes two existing Layout Tests which should
no longer crash as a result of this fix.

* accessibility/gtk/AccessibilityObjectAtk.cpp:
(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog (128285 => 128286)


--- releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog	2012-09-12 09:57:42 UTC (rev 128285)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog	2012-09-12 09:58:42 UTC (rev 128286)
@@ -1,3 +1,19 @@
+2012-09-10  Joanmarie Diggs  <jdi...@igalia.com>
+
+        [GTK][a11y] editing/pasteboard/paste-blockquote-into-blockquote-4.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=96199
+
+        Reviewed by Martin Robinson.
+
+        Added sanity check to correct erroneous assumption that there will
+        always be a child object.
+
+        No new tests as the bug crashes two existing Layout Tests which should
+        no longer crash as a result of this fix.
+
+        * accessibility/gtk/AccessibilityObjectAtk.cpp:
+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+
 2012-08-24  Sergio Villar Senin  <svil...@igalia.com>
 
         [GTK] Purge unused favicons from IconDatabase after 30 days

Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp (128285 => 128286)


--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp	2012-09-12 09:57:42 UTC (rev 128285)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp	2012-09-12 09:58:42 UTC (rev 128286)
@@ -89,7 +89,7 @@
             return DefaultBehavior;
 
         child = child->firstChild();
-        if (child->isLink() || !child->firstAnonymousBlockChild())
+        if (child && (child->isLink() || !child->firstAnonymousBlockChild()))
             return IncludeObject;
     }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to