Title: [189779] releases/WebKitGTK/webkit-2.10/Source/WebKit2
Revision
189779
Author
carlo...@webkit.org
Date
2015-09-14 23:48:02 -0700 (Mon, 14 Sep 2015)

Log Message

Merge r189442 - Leak in WebContextInjectedBundleClient::getInjectedBundleInitializationUserData
https://bugs.webkit.org/show_bug.cgi?id=148769

Fix suggested by Zan Dobersek.

Reviewed by Darin Adler.

* UIProcess/WebContextInjectedBundleClient.cpp:
(WebKit::WebContextInjectedBundleClient::getInjectedBundleInitializationUserData):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (189778 => 189779)


--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-09-15 06:46:48 UTC (rev 189778)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog	2015-09-15 06:48:02 UTC (rev 189779)
@@ -1,3 +1,15 @@
+2015-09-05  Michael Catanzaro  <mcatanz...@igalia.com>
+
+        Leak in WebContextInjectedBundleClient::getInjectedBundleInitializationUserData
+        https://bugs.webkit.org/show_bug.cgi?id=148769
+
+        Fix suggested by Zan Dobersek.
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/WebContextInjectedBundleClient.cpp:
+        (WebKit::WebContextInjectedBundleClient::getInjectedBundleInitializationUserData):
+
 2015-08-31  Antti Koivisto  <an...@apple.com>
 
         Network Cache: Stale content after back navigation

Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp (189778 => 189779)


--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp	2015-09-15 06:46:48 UTC (rev 189778)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp	2015-09-15 06:48:02 UTC (rev 189779)
@@ -57,7 +57,7 @@
     if (!m_client.getInjectedBundleInitializationUserData)
         return 0;
 
-    return toImpl(m_client.getInjectedBundleInitializationUserData(toAPI(processPool), m_client.base.clientInfo));
+    return adoptRef(toImpl(m_client.getInjectedBundleInitializationUserData(toAPI(processPool), m_client.base.clientInfo)));
 }
 
 } // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to