Bug 864858 - Hold a reference to utterance before nsSpeechTask goes away in DispatchEndImpl() r=smaug

eeejay · eeejay · commit 7259239e6022 · 2013-04-24T09:49:35.000-07:00
diff --git a/content/media/webspeech/synth/nsSpeechTask.cpp b/content/media/webspeech/synth/nsSpeechTask.cpp
@@ -263,14 +263,16 @@ nsSpeechTask::DispatchEndImpl(float aElapsedTime, uint32_t aCharIndex)
     mStream->Destroy();
   }
 
+  nsRefPtr<SpeechSynthesisUtterance> utterance = mUtterance;
+
   if (mSpeechSynthesis) {
     mSpeechSynthesis->OnEnd(this);
   }
 
-  mUtterance->mState = SpeechSynthesisUtterance::STATE_ENDED;
-  mUtterance->DispatchSpeechSynthesisEvent(NS_LITERAL_STRING("end"),
-                                           aCharIndex, aElapsedTime,
-                                           NS_LITERAL_STRING(""));
+  utterance->mState = SpeechSynthesisUtterance::STATE_ENDED;
+  utterance->DispatchSpeechSynthesisEvent(NS_LITERAL_STRING("end"),
+                                          aCharIndex, aElapsedTime,
+                                          NS_LITERAL_STRING(""));
   return NS_OK;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -263,14 +263,16 @@ nsSpeechTask::DispatchEndImpl(float aElapsedTime, uint32_t aCharIndex)`
`263`	`263`	`mStream->Destroy();`
`264`	`264`	`}`
`265`	`265`
	`266`	`+ nsRefPtr<SpeechSynthesisUtterance> utterance = mUtterance;`
	`267`	`+`
`266`	`268`	`if (mSpeechSynthesis) {`
`267`	`269`	`mSpeechSynthesis->OnEnd(this);`
`268`	`270`	`}`
`269`	`271`
`270`		`- mUtterance->mState = SpeechSynthesisUtterance::STATE_ENDED;`
`271`		`- mUtterance->DispatchSpeechSynthesisEvent(NS_LITERAL_STRING("end"),`
`272`		`- aCharIndex, aElapsedTime,`
`273`		`- NS_LITERAL_STRING(""));`
	`272`	`+ utterance->mState = SpeechSynthesisUtterance::STATE_ENDED;`
	`273`	`+ utterance->DispatchSpeechSynthesisEvent(NS_LITERAL_STRING("end"),`
	`274`	`+ aCharIndex, aElapsedTime,`
	`275`	`+ NS_LITERAL_STRING(""));`
`274`	`276`	`return NS_OK;`
`275`	`277`	`}`
`276`	`278`