Title: [88551] trunk/Source/WebCore
- Revision
- 88551
- Author
- [email protected]
- Date
- 2011-06-10 10:56:52 -0700 (Fri, 10 Jun 2011)
Log Message
2011-06-10 Dimitri Glazkov <[email protected]>
Reviewed by Tony Chang.
REGRESSION (r88332): prototype-inheritance-2 ASSERTS attempting to enumerate spellCheckRanges
https://bugs.webkit.org/show_bug.cgi?id=62460
Test: fast/dom/prototype-inheritance-2.html
* dom/DocumentMarkerController.cpp:
(WebCore::DocumentMarkerController::userSpellingMarkersForNode): Added an extra 0-check.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (88550 => 88551)
--- trunk/Source/WebCore/ChangeLog 2011-06-10 17:51:02 UTC (rev 88550)
+++ trunk/Source/WebCore/ChangeLog 2011-06-10 17:56:52 UTC (rev 88551)
@@ -1,3 +1,15 @@
+2011-06-10 Dimitri Glazkov <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ REGRESSION (r88332): prototype-inheritance-2 ASSERTS attempting to enumerate spellCheckRanges
+ https://bugs.webkit.org/show_bug.cgi?id=62460
+
+ Test: fast/dom/prototype-inheritance-2.html
+
+ * dom/DocumentMarkerController.cpp:
+ (WebCore::DocumentMarkerController::userSpellingMarkersForNode): Added an extra 0-check.
+
2011-06-10 James Simonsen <[email protected]>
Reviewed by Tony Gentilcore.
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (88550 => 88551)
--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2011-06-10 17:51:02 UTC (rev 88550)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2011-06-10 17:56:52 UTC (rev 88551)
@@ -660,7 +660,11 @@
{
RefPtr<SpellcheckRangeList> result = SpellcheckRangeList::create();
- MarkerList* list = m_markers.get(userSpellingNode(node));
+ Node* spellingNode = userSpellingNode(node);
+ if (!spellingNode)
+ return result;
+
+ MarkerList* list = m_markers.get(spellingNode);
if (!list)
return result;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
