Changeset 247620 in webkit

Timestamp:

Jul 18, 2019 2:42:13 PM (5 years ago)

Author:

pvollan@apple.com

Message:

Crash under WebPage::boundaryEventOccurred
​https://bugs.webkit.org/show_bug.cgi?id=199907

Reviewed by Chris Fleizach.

Add null pointer checks.

No new tests, since I have not been able to reproduce this in a test.

• Modules/speech/SpeechSynthesis.cpp:

(WebCore::SpeechSynthesis::didStartSpeaking):
(WebCore::SpeechSynthesis::didFinishSpeaking):
(WebCore::SpeechSynthesis::didPauseSpeaking):
(WebCore::SpeechSynthesis::didResumeSpeaking):
(WebCore::SpeechSynthesis::speakingErrorOccurred):
(WebCore::SpeechSynthesis::boundaryEventOccurred):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/speech/SpeechSynthesis.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-18  Per Arne Vollan  <pvollan@apple.com>
+
+        Crash under WebPage::boundaryEventOccurred
+        https://bugs.webkit.org/show_bug.cgi?id=199907
+
+        Reviewed by Chris Fleizach.
+
+        Add null pointer checks.
+
+        No new tests, since I have not been able to reproduce this in a test.
+
+        * Modules/speech/SpeechSynthesis.cpp:
+        (WebCore::SpeechSynthesis::didStartSpeaking):
+        (WebCore::SpeechSynthesis::didFinishSpeaking):
+        (WebCore::SpeechSynthesis::didPauseSpeaking):
+        (WebCore::SpeechSynthesis::didResumeSpeaking):
+        (WebCore::SpeechSynthesis::speakingErrorOccurred):
+        (WebCore::SpeechSynthesis::boundaryEventOccurred):
+
 2019-07-18  Antoine Quint  <graouts@apple.com>
 

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

@@ -226 +226 @@
 void SpeechSynthesis::didStartSpeaking()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     didStartSpeaking(*m_currentSpeechUtterance->platformUtterance());
 }
@@ -231 +233 @@
 void SpeechSynthesis::didFinishSpeaking()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     didFinishSpeaking(*m_currentSpeechUtterance->platformUtterance());
 }
@@ -236 +240 @@
 void SpeechSynthesis::didPauseSpeaking()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     didPauseSpeaking(*m_currentSpeechUtterance->platformUtterance());
 }
@@ -241 +247 @@
 void SpeechSynthesis::didResumeSpeaking()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     didResumeSpeaking(*m_currentSpeechUtterance->platformUtterance());
 }
@@ -246 +254 @@
 void SpeechSynthesis::speakingErrorOccurred()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     speakingErrorOccurred(*m_currentSpeechUtterance->platformUtterance());
 }
@@ -251 +261 @@
 void SpeechSynthesis::boundaryEventOccurred(bool wordBoundary, unsigned charIndex)
 {
+    if (!m_currentSpeechUtterance)
+        return;
     boundaryEventOccurred(*m_currentSpeechUtterance->platformUtterance(), wordBoundary ? SpeechBoundary::SpeechWordBoundary : SpeechBoundary::SpeechSentenceBoundary, charIndex);
 }