Title: [126036] releases/WebKitGTK/webkit-1.8/Source/WebCore
- Revision
- 126036
- Author
- [email protected]
- Date
- 2012-08-20 09:18:29 -0700 (Mon, 20 Aug 2012)
Log Message
Merge 125181 - REGRESSION (r124997): Flaky crashes in two tests
https://bugs.webkit.org/show_bug.cgi?id=93501
Patch by Mario Sanchez Prada <[email protected]> on 2012-08-09
Reviewed by Martin Robinson.
Add missing null check to make sure we early return if the
accessibility object does not have a valid parent exposed in the
accessibility hierarchy.
* accessibility/gtk/AXObjectCacheAtk.cpp:
(WebCore::emitTextChanged): Add missing null check.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog (126035 => 126036)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-08-20 16:18:24 UTC (rev 126035)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/ChangeLog 2012-08-20 16:18:29 UTC (rev 126036)
@@ -1,3 +1,17 @@
+2012-08-09 Mario Sanchez Prada <[email protected]>
+
+ REGRESSION (r124997): Flaky crashes in two tests
+ https://bugs.webkit.org/show_bug.cgi?id=93501
+
+ Reviewed by Martin Robinson.
+
+ Add missing null check to make sure we early return if the
+ accessibility object does not have a valid parent exposed in the
+ accessibility hierarchy.
+
+ * accessibility/gtk/AXObjectCacheAtk.cpp:
+ (WebCore::emitTextChanged): Add missing null check.
+
2012-08-08 Mario Sanchez Prada <[email protected]>
REGRESSION(r65062): out of bound access in TextIterator (5 editing tests) on GTK
Modified: releases/WebKitGTK/webkit-1.8/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp (126035 => 126036)
--- releases/WebKitGTK/webkit-1.8/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp 2012-08-20 16:18:24 UTC (rev 126035)
+++ releases/WebKitGTK/webkit-1.8/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp 2012-08-20 16:18:29 UTC (rev 126036)
@@ -160,7 +160,11 @@
static void emitTextChanged(AccessibilityObject* object, AXObjectCache::AXTextChange textChange, unsigned offset, const String& text)
{
- AtkObject* wrapper = object->parentObjectUnignored()->wrapper();
+ AccessibilityObject* parentObject = object->parentObjectUnignored();
+ if (!parentObject)
+ return;
+
+ AtkObject* wrapper = parentObject->wrapper();
if (!wrapper || !ATK_IS_TEXT(wrapper))
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes