Changeset 189779 in webkit

Timestamp:

Sep 14, 2015 11:48:02 PM (9 years ago)

Author:

Carlos Garcia Campos

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):

Location:

releases/WebKitGTK/webkit-2.10/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContextInjectedBundleClient.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-09-05  Michael Catanzaro  <mcatanzaro@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  <antti@apple.com>
 

releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp

@@ -58 +58 @@
         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)));
 }