Title: [167657] releases/WebKitGTK/webkit-2.4/Source/WebKit2
Revision
167657
Author
carlo...@webkit.org
Date
2014-04-22 06:39:49 -0700 (Tue, 22 Apr 2014)

Log Message

Merge r167656 - [GTK] Crash after getting web view context property with g_object_get
https://bugs.webkit.org/show_bug.cgi?id=131983

Reviewed by Philippe Normand.

The problem is that the getter is using g_value_take_object() and
the default context is destroyed when the caller releases its ref.

* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewGetProperty): Use g_value_set_object() instead of
g_value_take_object().

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (167656 => 167657)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog	2014-04-22 13:36:21 UTC (rev 167656)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog	2014-04-22 13:39:49 UTC (rev 167657)
@@ -1,3 +1,17 @@
+2014-04-22  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [GTK] Crash after getting web view context property with g_object_get
+        https://bugs.webkit.org/show_bug.cgi?id=131983
+
+        Reviewed by Philippe Normand.
+
+        The problem is that the getter is using g_value_take_object() and
+        the default context is destroyed when the caller releases its ref.
+
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkitWebViewGetProperty): Use g_value_set_object() instead of
+        g_value_take_object().
+
 2014-03-20  Alexey Proskuryakov  <a...@apple.com>
 
         Generalize WebInspector check in maybeInitializeSandboxExtensionHandle().

Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (167656 => 167657)


--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp	2014-04-22 13:36:21 UTC (rev 167656)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp	2014-04-22 13:39:49 UTC (rev 167657)
@@ -561,7 +561,7 @@
 
     switch (propId) {
     case PROP_WEB_CONTEXT:
-        g_value_take_object(value, webView->priv->context);
+        g_value_set_object(value, webView->priv->context);
         break;
     case PROP_GROUP:
         g_value_set_object(value, webkit_web_view_get_group(webView));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to