Bug 1418331 - add null protection. r?drno draft
authorMunro Mengjue Chiang <mchiang@mozilla.com>
Thu, 23 Nov 2017 23:52:23 +0800
changeset 704117 477eb809270be15fded5249db629cb941a07e071
parent 704067 d22da8d7d54987dc4796c2a223164751669466ee
child 742008 652eecc4aac81879cc4e6fe085b86c64a1236f38
push id91084
push userbmo:mchiang@mozilla.com
push dateTue, 28 Nov 2017 09:39:19 +0000
reviewersdrno
bugs1418331
milestone59.0a1
Bug 1418331 - add null protection. r?drno MozReview-Commit-ID: 5RnEwdjqdz4
dom/media/systemservices/VideoEngine.cpp
--- a/dom/media/systemservices/VideoEngine.cpp
+++ b/dom/media/systemservices/VideoEngine.cpp
@@ -38,22 +38,25 @@ int VideoEngine::SetAndroidObjects(JavaV
 #endif
   return 0;
 }
 #endif
 
 void
 VideoEngine::CreateVideoCapture(int32_t& id, const char* deviceUniqueIdUTF8) {
   LOG((__PRETTY_FUNCTION__));
+  MOZ_ASSERT(deviceUniqueIdUTF8);
 
   id = GenerateId();
   LOG(("CaptureDeviceInfo.type=%s id=%d",mCaptureDevInfo.TypeName(),id));
 
   for (auto &it : mCaps) {
-    if (strcmp(it.second.VideoCapture()->CurrentDeviceName(), deviceUniqueIdUTF8) == 0) {
+    if (it.second.VideoCapture() &&
+        it.second.VideoCapture()->CurrentDeviceName() &&
+        strcmp(it.second.VideoCapture()->CurrentDeviceName(), deviceUniqueIdUTF8) == 0) {
       mIdMap.emplace(id, it.first);
       return;
     }
   }
 
   CaptureEntry entry = {-1, nullptr};
 
   if (mCaptureDevInfo.type == webrtc::CaptureDeviceType::Camera) {