Changeset 273786 in webkit

Timestamp:

Mar 2, 2021, 7:08:19 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r273265. rdar://problem/74953476

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.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@273265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612.1.5-branch/Source/WebKit

Files:

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

branches/safari-612.1.5-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-03-02  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r273265. rdar://problem/74953476
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273265 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-24  Russell Epstein  <repstein@apple.com>
 

branches/safari-612.1.5-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp

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