Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: Source/WebCore/editing/DeleteSelectionCommand.cpp

Issue 9331006: Merge 106380 - Source/WebCore: Crash in DeleteSelectionCommand::handleGeneralDelete when attempti... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/editing/deleting/delete-start-block-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/editing/DeleteSelectionCommand.cpp
===================================================================
--- Source/WebCore/editing/DeleteSelectionCommand.cpp (revision 106819)
+++ Source/WebCore/editing/DeleteSelectionCommand.cpp (working copy)
@@ -418,6 +418,8 @@
if (startNode == m_startBlock && startOffset == 0 && canHaveChildrenForEditing(startNode) && !startNode->hasTagName(tableTag)) {
startOffset = 0;
startNode = startNode->traverseNextNode();
+ if (!startNode)
+ return;
}
if (startOffset >= caretMaxOffset(startNode) && startNode->isTextNode()) {
« no previous file with comments | « LayoutTests/editing/deleting/delete-start-block-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698