Changeset 252207 in webkit

Timestamp:

Nov 7, 2019 2:53:47 PM (4 years ago)

Author:

eric.carlson@apple.com

Message:

UserMediaController::from(document) can return nullptr
​https://bugs.webkit.org/show_bug.cgi?id=203977
<rdar://problem/56908013>

Reviewed by Jer Noble.

• Modules/mediastream/MediaDevices.cpp:

(WebCore::MediaDevices::stop): NULL-check the UserMediaController.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaDevices.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-07  Eric Carlson  <eric.carlson@apple.com>
+
+        UserMediaController::from(document) can return nullptr
+        https://bugs.webkit.org/show_bug.cgi?id=203977
+        <rdar://problem/56908013>
+
+        Reviewed by Jer Noble.
+
+        * Modules/mediastream/MediaDevices.cpp:
+        (WebCore::MediaDevices::stop): NULL-check the UserMediaController.
+
 2019-11-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp

@@ -76 +76 @@
     if (m_deviceChangeToken) {
         auto* controller = UserMediaController::from(document()->page());
-        controller->removeDeviceChangeObserver(m_deviceChangeToken);
+        if (controller)
+            controller->removeDeviceChangeObserver(m_deviceChangeToken);
     }
     m_devices.clear();