Title: [97395] trunk/Source/WebCore
- Revision
- 97395
- Author
- [email protected]
- Date
- 2011-10-13 13:58:42 -0700 (Thu, 13 Oct 2011)
Log Message
Crash in DeleteSelectionCommand::handleGeneralDelete
https://bugs.webkit.org/show_bug.cgi?id=70045
Reviewed by Darin Adler.
Exit early when m_upstreamStart is null.
No new tests because we don't have a reduction.
* editing/DeleteSelectionCommand.cpp:
(WebCore::DeleteSelectionCommand::handleGeneralDelete):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97394 => 97395)
--- trunk/Source/WebCore/ChangeLog 2011-10-13 20:54:53 UTC (rev 97394)
+++ trunk/Source/WebCore/ChangeLog 2011-10-13 20:58:42 UTC (rev 97395)
@@ -1,3 +1,17 @@
+2011-10-13 Ryosuke Niwa <[email protected]>
+
+ Crash in DeleteSelectionCommand::handleGeneralDelete
+ https://bugs.webkit.org/show_bug.cgi?id=70045
+
+ Reviewed by Darin Adler.
+
+ Exit early when m_upstreamStart is null.
+
+ No new tests because we don't have a reduction.
+
+ * editing/DeleteSelectionCommand.cpp:
+ (WebCore::DeleteSelectionCommand::handleGeneralDelete):
+
2011-10-13 David Hyatt <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=70049
Modified: trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp (97394 => 97395)
--- trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp 2011-10-13 20:54:53 UTC (rev 97394)
+++ trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp 2011-10-13 20:58:42 UTC (rev 97395)
@@ -408,9 +408,12 @@
void DeleteSelectionCommand::handleGeneralDelete()
{
+ if (m_upstreamStart.isNull())
+ return;
+
int startOffset = m_upstreamStart.deprecatedEditingOffset();
Node* startNode = m_upstreamStart.deprecatedNode();
-
+
// Never remove the start block unless it's a table, in which case we won't merge content in.
if (startNode == m_startBlock && startOffset == 0 && canHaveChildrenForEditing(startNode) && !startNode->hasTagName(tableTag)) {
startOffset = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
