Bug 1300446 - Check return value from GetCubebContextUnlocked - r?kinetik draft
authorGerald Squelart <gsquelart@mozilla.com>
Tue, 30 Aug 2016 17:08:06 -0700
changeset 409739 13efd4025f11f0091ee30cb94295a2f421863191
parent 409738 396ad56d67f8fe48c7f9807d239024b49d4ad9bd
child 409740 33c4cf75c32f78c4b2ce0baddb785cf30e4a0d00
push id28527
push usergsquelart@mozilla.com
push dateMon, 05 Sep 2016 01:07:03 +0000
reviewerskinetik
bugs1300446
milestone51.0a1
Bug 1300446 - Check return value from GetCubebContextUnlocked - r?kinetik MozReview-Commit-ID: LaXsymagjGW
dom/media/CubebUtils.cpp
--- 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;
   }