Title: [273789] branches/safari-612.1.5-branch/Source/WebKit
- Revision
- 273789
- Author
- [email protected]
- Date
- 2021-03-02 19:08:27 -0800 (Tue, 02 Mar 2021)
Log Message
Cherry-pick r273289. rdar://problem/74953476
UserMediaPermissionRequestManagerProxy may be released while computing capture device list
https://bugs.webkit.org/show_bug.cgi?id=222236
<rdar://74480265>
Unreviewed, address post-review comment.
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList): Use
captured `this`.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273289 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.5-branch/Source/WebKit/ChangeLog (273788 => 273789)
--- branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-03-03 03:08:24 UTC (rev 273788)
+++ branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-03-03 03:08:27 UTC (rev 273789)
@@ -1,5 +1,35 @@
2021-03-02 Alan Coon <[email protected]>
+ Cherry-pick r273289. rdar://problem/74953476
+
+ UserMediaPermissionRequestManagerProxy may be released while computing capture device list
+ https://bugs.webkit.org/show_bug.cgi?id=222236
+ <rdar://74480265>
+
+ Unreviewed, address post-review comment.
+
+
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList): Use
+ captured `this`.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273289 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-02-22 Eric Carlson <[email protected]>
+
+ UserMediaPermissionRequestManagerProxy may be released while computing capture device list
+ https://bugs.webkit.org/show_bug.cgi?id=222236
+ <rdar://74480265>
+
+ Unreviewed, address post-review comment.
+
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::computeFilteredDeviceList): Use
+ captured `this`.
+
+2021-03-02 Alan Coon <[email protected]>
+
Cherry-pick r273271. rdar://problem/74953207
[macOS] Crash under AuxiliaryProcess::initializeSandbox
Modified: branches/safari-612.1.5-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (273788 => 273789)
--- branches/safari-612.1.5-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2021-03-03 03:08:24 UTC (rev 273788)
+++ branches/safari-612.1.5-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2021-03-03 03:08:27 UTC (rev 273789)
@@ -740,7 +740,7 @@
filteredDevices.append(revealIdsAndLabels ? device : CaptureDevice({ }, device.type(), { }, { }));
}
- weakThis->m_hasFilteredDeviceList = !revealIdsAndLabels;
+ m_hasFilteredDeviceList = !revealIdsAndLabels;
ALWAYS_LOG(LOGIDENTIFIER, filteredDevices.size(), " devices revealed");
completion(WTFMove(filteredDevices));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
