Changeset 147800 in webkit

Timestamp:

Apr 5, 2013 2:51:17 PM (11 years ago)

Author:

Chris Fleizach

Message:

WebSpeech: crash at WebCore::SpeechSynthesis::speak
​https://bugs.webkit.org/show_bug.cgi?id=113937

Reviewed by Tim Horton.

Source/WebCore:

Protect against the case when invalid data is passed in.

Test: platform/mac/fast/speechsynthesis/speech-synthesis-crash-on-bad-utterance.html

• Modules/speech/SpeechSynthesis.cpp:

(WebCore::SpeechSynthesis::speak):

• Modules/speech/SpeechSynthesisUtterance.cpp:

(WebCore::SpeechSynthesisUtterance::setVoice):

LayoutTests:

• platform/mac/fast/speechsynthesis/speech-synthesis-crash-on-bad-utterance-expected.txt: Added.
• platform/mac/fast/speechsynthesis/speech-synthesis-crash-on-bad-utterance.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-crash-on-bad-utterance-expected.txt (added)
• LayoutTests/platform/mac/fast/speechsynthesis/speech-synthesis-crash-on-bad-utterance.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/speech/SpeechSynthesis.cpp (modified) (1 diff)
• Source/WebCore/Modules/speech/SpeechSynthesisUtterance.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-05  Chris Fleizach  <cfleizach@apple.com>
+
+        WebSpeech: crash at WebCore::SpeechSynthesis::speak
+        https://bugs.webkit.org/show_bug.cgi?id=113937
+
+        Reviewed by Tim Horton.
+
+        * platform/mac/fast/speechsynthesis/speech-synthesis-crash-on-bad-utterance-expected.txt: Added.
+        * platform/mac/fast/speechsynthesis/speech-synthesis-crash-on-bad-utterance.html: Added.
+
 2013-04-05  Rijubrata Bhaumik  <rijubrata.bhaumik@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-05  Chris Fleizach  <cfleizach@apple.com>
+
+        WebSpeech: crash at WebCore::SpeechSynthesis::speak
+        https://bugs.webkit.org/show_bug.cgi?id=113937
+
+        Reviewed by Tim Horton.
+
+        Protect against the case when invalid data is passed in.
+
+        Test: platform/mac/fast/speechsynthesis/speech-synthesis-crash-on-bad-utterance.html
+
+        * Modules/speech/SpeechSynthesis.cpp:
+        (WebCore::SpeechSynthesis::speak):
+        * Modules/speech/SpeechSynthesisUtterance.cpp:
+        (WebCore::SpeechSynthesisUtterance::setVoice):
+
 2013-04-05  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp

@@ -103 +103 @@
 void SpeechSynthesis::speak(SpeechSynthesisUtterance* utterance)
 {
+    if (!utterance)
+        return;
+    
     m_utteranceQueue.append(utterance);
     

trunk/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.cpp

@@ -65 +65 @@
 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice)
 {
+    if (!voice)
+        return;
+    
     // Cache our own version of the SpeechSynthesisVoice so that we don't have to do some lookup
     // to go from the platform voice back to the speech synthesis voice in the read property.