Crash when running some editing related tests

https://bugs.webkit.org/show_bug.cgi?id=84091

Reviewed by Andreas Kling.

Null check triggeringEvent.

* editing/Editor.cpp:
(WebCore::Editor::insertTextWithoutSendingTextEvent):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114311 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 9bc19b8..41d1041 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-16  Anders Carlsson  <andersca@apple.com>
+
+        Crash when running some editing related tests
+        https://bugs.webkit.org/show_bug.cgi?id=84091
+
+        Reviewed by Andreas Kling.
+
+        Null check triggeringEvent.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::insertTextWithoutSendingTextEvent):
+
 2012-04-16  Simon Fraser  <simon.fraser@apple.com>
 
         Rename to updateZOrderListsSlowCase to rebuildZOrderLists

diff --git a/Source/WebCore/editing/Editor.cpp b/Source/WebCore/editing/Editor.cpp
index 22884fa..294eb94 100644 (file)
--- a/Source/WebCore/editing/Editor.cpp
+++ b/Source/WebCore/editing/Editor.cpp
@@ -916,7 +916,7 @@ bool Editor::insertTextWithoutSendingTextEvent(const String& text, bool selectIn
             RefPtr<Document> document = selectionStart->document();
 
             // Insert the text
-            if (triggeringEvent->isDictation())
+            if (triggeringEvent && triggeringEvent->isDictation())
                 DictationCommand::insertText(document.get(), text, triggeringEvent->dictationAlternatives(), selection);
             else {
                 TypingCommand::Options options = 0;