Title: [247620] trunk/Source/WebCore
Revision
247620
Author
pvol...@apple.com
Date
2019-07-18 14:42:13 -0700 (Thu, 18 Jul 2019)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (247619 => 247620)


--- trunk/Source/WebCore/ChangeLog	2019-07-18 21:15:15 UTC (rev 247619)
+++ trunk/Source/WebCore/ChangeLog	2019-07-18 21:42:13 UTC (rev 247620)
@@ -1,3 +1,22 @@
+2019-07-18  Per Arne Vollan  <pvol...@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  <grao...@apple.com>
 
         [Pointer Events] The button and buttons properties are incorrect on iOS

Modified: trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp (247619 => 247620)


--- trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp	2019-07-18 21:15:15 UTC (rev 247619)
+++ trunk/Source/WebCore/Modules/speech/SpeechSynthesis.cpp	2019-07-18 21:42:13 UTC (rev 247620)
@@ -225,31 +225,43 @@
 
 void SpeechSynthesis::didStartSpeaking()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     didStartSpeaking(*m_currentSpeechUtterance->platformUtterance());
 }
 
 void SpeechSynthesis::didFinishSpeaking()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     didFinishSpeaking(*m_currentSpeechUtterance->platformUtterance());
 }
 
 void SpeechSynthesis::didPauseSpeaking()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     didPauseSpeaking(*m_currentSpeechUtterance->platformUtterance());
 }
 
 void SpeechSynthesis::didResumeSpeaking()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     didResumeSpeaking(*m_currentSpeechUtterance->platformUtterance());
 }
 
 void SpeechSynthesis::speakingErrorOccurred()
 {
+    if (!m_currentSpeechUtterance)
+        return;
     speakingErrorOccurred(*m_currentSpeechUtterance->platformUtterance());
 }
 
 void SpeechSynthesis::boundaryEventOccurred(bool wordBoundary, unsigned charIndex)
 {
+    if (!m_currentSpeechUtterance)
+        return;
     boundaryEventOccurred(*m_currentSpeechUtterance->platformUtterance(), wordBoundary ? SpeechBoundary::SpeechWordBoundary : SpeechBoundary::SpeechSentenceBoundary, charIndex);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to