Changeset 244011 in webkit

Timestamp:

Apr 8, 2019, 5:39:27 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r243291 - Fix possible memory leak when dismissing a color picker
​https://bugs.webkit.org/show_bug.cgi?id=196026
<rdar://problem/48778568>

Reviewed by Wenson Hsieh.

Fix a problem with WebPageProxy::endColorPicker where an early return could leave a color picker
with a +1 reference count after dismissing it.

• UIProcess/WebColorPicker.cpp:

(WebKit::WebColorPicker::endPicker):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::endColorPicker):
(WebKit::WebPageProxy::didEndColorPicker):

Location:

releases/WebKitGTK/webkit-2.24/Source/WebKit

Files:

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

releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-21  Brent Fulgham  <bfulgham@apple.com>
+
+        Fix possible memory leak when dismissing a color picker
+        https://bugs.webkit.org/show_bug.cgi?id=196026
+        <rdar://problem/48778568>
+
+        Reviewed by Wenson Hsieh.
+
+        Fix a problem with WebPageProxy::endColorPicker where an early return could leave a color picker
+        with a +1 reference count after dismissing it.
+
+        * UIProcess/WebColorPicker.cpp:
+        (WebKit::WebColorPicker::endPicker):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::endColorPicker):
+        (WebKit::WebPageProxy::didEndColorPicker):
+
 2019-03-28  Michael Catanzaro  <mcatanzaro@igalia.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebColorPicker.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Samsung Electronics. All rights reserved.
+ * Copyright (C) 2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45 +46 @@
         return;
 
-    m_client->didEndColorPicker();
-    m_client = nullptr;
+    if (auto client = std::exchange(m_client, nullptr))
+        client->didEndColorPicker();
 }
 

releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -5337 +5337 @@
 void WebPageProxy::didEndColorPicker()
 {
-    if (!isValid())
-        return;
-
     m_colorPicker = nullptr;
+    if (!isValid())
+        return;
+
     m_process->send(Messages::WebPage::DidEndColorPicker(), m_pageID);
 }