Bug 1300446 - Check return value from GetCubebContextUnlocked - r?kinetik
MozReview-Commit-ID: LaXsymagjGW
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -127,21 +127,25 @@ cubeb* GetCubebContext()
{
StaticMutexAutoLock lock(sMutex);
return GetCubebContextUnlocked();
}
void InitPreferredSampleRate()
{
StaticMutexAutoLock lock(sMutex);
- if (sPreferredSampleRate == 0 &&
- cubeb_get_preferred_sample_rate(GetCubebContextUnlocked(),
- &sPreferredSampleRate) != CUBEB_OK) {
- // Query failed, use a sensible default.
- sPreferredSampleRate = 44100;
+ if (sPreferredSampleRate == 0) {
+ cubeb* context = GetCubebContextUnlocked();
+ if (context) {
+ if (cubeb_get_preferred_sample_rate(context,
+ &sPreferredSampleRate) != CUBEB_OK) {
+ // Query failed, use a sensible default.
+ sPreferredSampleRate = 44100;
+ }
+ }
}
}
void InitBrandName()
{
if (sBrandName) {
return;
}