Changeset 221896 in webkit

Timestamp:

Sep 11, 2017, 5:40:11 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Fix memory leak introduced in r221894.
​https://bugs.webkit.org/show_bug.cgi?id=176753

• UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp:

(WebKit::NotificationPermissionRequestManagerProxy::createRequest):
The NotificationPermissionRequestManagerProxy keeps track of pending requests
so they can be denied when invalidating the page. We add them to a HashMap and in
r221894 I removed the code that removes them from that map once the request is complete.
This code adds the completed task removal back.
The NotificationPermissionRequestManagerProxy and WebPageProxy have the same lifetime,
so protecting the WebPageProxy (m_page) makes sure there is no use-after-free when the
completion handler is called.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-09-11  Alex Christensen  <achristensen@webkit.org>
+
+        Fix memory leak introduced in r221894.
+        https://bugs.webkit.org/show_bug.cgi?id=176753
+
+        * UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp:
+        (WebKit::NotificationPermissionRequestManagerProxy::createRequest):
+        The NotificationPermissionRequestManagerProxy keeps track of pending requests
+        so they can be denied when invalidating the page.  We add them to a HashMap and in
+        r221894 I removed the code that removes them from that map once the request is complete.
+        This code adds the completed task removal back.
+        The NotificationPermissionRequestManagerProxy and WebPageProxy have the same lifetime,
+        so protecting the WebPageProxy (m_page) makes sure there is no use-after-free when the
+        completion handler is called.
+
 2017-09-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/Notifications/NotificationPermissionRequestManagerProxy.cpp

@@ -49 +49 @@
 Ref<NotificationPermissionRequest> NotificationPermissionRequestManagerProxy::createRequest(uint64_t notificationID)
 {
-    auto request = NotificationPermissionRequest::create([notificationID, page = makeRef(m_page)](bool allowed) {
+    auto request = NotificationPermissionRequest::create([this, notificationID, page = makeRef(m_page)](bool allowed) {
+        m_pendingRequests.take(notificationID);
         page->process().send(Messages::WebPage::DidReceiveNotificationPermissionDecision(notificationID, allowed), page->pageID());
     });