Changeset 162306 in webkit

Timestamp:

Jan 20, 2014 12:01:16 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GLIB] GVariant floating references are not correctly handled by GRefPtr
​https://bugs.webkit.org/show_bug.cgi?id=127246

Reviewed by Martin Robinson.

Source/WebCore:

Do not adopt GVariant floating references, they will be converted
to a full reference by GRefPtr.

• platform/gtk/PasteboardHelper.cpp:

(WebCore::PasteboardHelper::fillSelectionData):
(WebCore::PasteboardHelper::fillDataObjectFromDropData):

Source/WTF:

GRefPtr should always use g_variant_ref_sink to deal with GVariant
floating references. In case of full references,
g_variant_ref_sink calls g_variant_ref, so it's safe to use it always.

• wtf/gobject/GRefPtr.cpp:

(WTF::refGPtr): Use g_variant_ref_sink().

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/gobject/GRefPtr.cpp (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/PasteboardHelper.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-01-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GLIB] GVariant floating references are not correctly handled by GRefPtr
+        https://bugs.webkit.org/show_bug.cgi?id=127246
+
+        Reviewed by Martin Robinson.
+
+        GRefPtr should always use g_variant_ref_sink to deal with GVariant
+        floating references. In case of full references,
+        g_variant_ref_sink calls g_variant_ref, so it's safe to use it always.
+
+        * wtf/gobject/GRefPtr.cpp:
+        (WTF::refGPtr): Use g_variant_ref_sink().
+
 2014-01-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WTF/wtf/gobject/GRefPtr.cpp

@@ -99 +99 @@
 {
     if (ptr)
-        g_variant_ref(ptr);
+        g_variant_ref_sink(ptr);
     return ptr;
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-19  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GLIB] GVariant floating references are not correctly handled by GRefPtr
+        https://bugs.webkit.org/show_bug.cgi?id=127246
+
+        Reviewed by Martin Robinson.
+
+        Do not adopt GVariant floating references, they will be converted
+        to a full reference by GRefPtr.
+
+        * platform/gtk/PasteboardHelper.cpp:
+        (WebCore::PasteboardHelper::fillSelectionData):
+        (WebCore::PasteboardHelper::fillDataObjectFromDropData):
+
 2014-01-19  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp

@@ -198 +198 @@
         }
 
-        GRefPtr<GVariant> variant = adoptGRef(g_variant_builder_end(&builder));
+        GRefPtr<GVariant> variant = g_variant_builder_end(&builder);
         GOwnPtr<gchar> serializedVariant(g_variant_print(variant.get(), TRUE));
         gtk_selection_data_set(selectionData, unknownAtom, 1, reinterpret_cast<const guchar*>(serializedVariant.get()), strlen(serializedVariant.get()));
@@ -257 +257 @@
             dataObject->setText(pieces[1]);
     } else if (target == unknownAtom) {
-        GRefPtr<GVariant> variant = adoptGRef(g_variant_new_parsed(reinterpret_cast<const char*>(gtk_selection_data_get_data(data))));
+        GRefPtr<GVariant> variant = g_variant_new_parsed(reinterpret_cast<const char*>(gtk_selection_data_get_data(data)));
 
         GOwnPtr<gchar> key;