Changeset 273265 in webkit

Timestamp:

Feb 22, 2021 11:44:49 AM (3 years ago)

Author:

eric.carlson@apple.com

Message:

UserMediaPermissionRequestManagerProxy may be released while computing capture device list
​https://bugs.webkit.org/show_bug.cgi?id=222236
<rdar://74480265>

Reviewed by Youenn Fablet.

• UIProcess/UserMediaPermissionRequestManagerProxy.cpp:

(WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList): Return early
if weakThis is NULL.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/UserMediaPermissionRequestManagerProxy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-22  Eric Carlson  <eric.carlson@apple.com>
+
+        UserMediaPermissionRequestManagerProxy may be released while computing capture device list
+        https://bugs.webkit.org/show_bug.cgi?id=222236
+        <rdar://74480265>
+
+        Reviewed by Youenn Fablet.
+
+        * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+        (WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList): Return early
+        if `weakThis` is NULL.
+
 2021-02-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp

@@ -711 +711 @@
 
     platformGetMediaStreamDevices([this, weakThis = makeWeakPtr(this), revealIdsAndLabels, completion = WTFMove(completion)](auto&& devices) mutable {
+
+        if (!weakThis)
+            completion({ });
+
         unsigned cameraCount = 0;
         unsigned microphoneCount = 0;
@@ -735 +739 @@
         }
 
-        if (weakThis)
-            m_hasFilteredDeviceList = !revealIdsAndLabels;
-
+        weakThis->m_hasFilteredDeviceList = !revealIdsAndLabels;
         ALWAYS_LOG(LOGIDENTIFIER, filteredDevices.size(), " devices revealed");
+
         completion(WTFMove(filteredDevices));
     });