Changeset 245178 in webkit

Timestamp:

May 10, 2019 10:19:24 AM (5 years ago)

Author:

Chris Fleizach

Message:

AX: Crash at WebKit: WebKit::WebSpeechSynthesisClient::speak
​https://bugs.webkit.org/show_bug.cgi?id=197761
<rdar://problem/50237614>

Reviewed by Per Arne Vollan.

Source/WebKit:

It's valid for the incoming voice to be nil, so we need to protect against that.

Tests: fast/speechsynthesis/speech-synthesis-real-client-version.html

• WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp:

(WebKit::WebSpeechSynthesisClient::speak):

LayoutTests:

• fast/speechsynthesis/speech-synthesis-real-client-version-expected.txt: Added.
• fast/speechsynthesis/speech-synthesis-real-client-version.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/speechsynthesis/speech-synthesis-real-client-version-expected.txt (added)
• LayoutTests/fast/speechsynthesis/speech-synthesis-real-client-version.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-10  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Crash at WebKit: WebKit::WebSpeechSynthesisClient::speak
+        https://bugs.webkit.org/show_bug.cgi?id=197761
+        <rdar://problem/50237614>
+
+        Reviewed by Per Arne Vollan.
+
+        * fast/speechsynthesis/speech-synthesis-real-client-version-expected.txt: Added.
+        * fast/speechsynthesis/speech-synthesis-real-client-version.html: Added.
+
 2019-05-10  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-10  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Crash at WebKit: WebKit::WebSpeechSynthesisClient::speak
+        https://bugs.webkit.org/show_bug.cgi?id=197761
+        <rdar://problem/50237614>
+
+        Reviewed by Per Arne Vollan.
+
+        It's valid for the incoming voice to be nil, so we need to protect against that.
+
+        Tests: fast/speechsynthesis/speech-synthesis-real-client-version.html
+
+        * WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp:
+        (WebKit::WebSpeechSynthesisClient::speak):
+
 2019-05-10  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp

@@ -59 +59 @@
 
     auto voice = utterance->voice();
-    m_page.sendWithAsyncReply(Messages::WebPageProxy::SpeechSynthesisSpeak(utterance->text(), utterance->lang(), utterance->volume(), utterance->rate(), utterance->pitch(), utterance->startTime(), voice->voiceURI(), voice->name(), voice->lang(), voice->localService(), voice->isDefault()), WTFMove(completionHandler));
+    auto voiceURI = voice ? voice->voiceURI() : "";
+    auto name = voice ? voice->name() : "";
+    auto lang = voice ? voice->lang() : "";
+    auto localService = voice ? voice->localService() : false;
+    auto isDefault = voice ? voice->isDefault() : false;
+
+    m_page.sendWithAsyncReply(Messages::WebPageProxy::SpeechSynthesisSpeak(utterance->text(), utterance->lang(), utterance->volume(), utterance->rate(), utterance->pitch(), utterance->startTime(), voiceURI, name, lang, localService, isDefault), WTFMove(completionHandler));
 
     m_page.corePage()->speechSynthesisClient()->observer()->didStartSpeaking();