Fix memory management with g_object_get and struct properties

Fixes bug 613918.

diff --git a/codegen/valaccodearraymodule.vala b/codegen/valaccodearraymodule.vala
index 093605db8263fe8cab2ca6946ea0fd5e6dcab8c6..01bf85f3cfa5955eddbe833f4c52c7806a6dcceb 100644 (file)
--- a/codegen/valaccodearraymodule.vala
+++ b/codegen/valaccodearraymodule.vala
@@ -736,7 +736,7 @@ internal class Vala.CCodeArrayModule : CCodeMethodCallModule {
                }
        }
 
-       public override CCodeExpression get_unref_expression (CCodeExpression cvar, DataType type, Expression expr, bool is_macro_definition) {
+       public override CCodeExpression get_unref_expression (CCodeExpression cvar, DataType type, Expression? expr, bool is_macro_definition) {
                if (type is ArrayType) {
                        var array_type = (ArrayType) type;
 

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 6bbd100892129708d9a915dd0543770a21d64eea..634fb66cece4a6c8c92674f0a864b68e7c9a9f96 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2843,7 +2843,7 @@ internal class Vala.CCodeBaseModule : CCodeModule {
                return null;
        }
 
-       public virtual CCodeExpression get_unref_expression (CCodeExpression cvar, DataType type, Expression expr, bool is_macro_definition = false) {
+       public virtual CCodeExpression get_unref_expression (CCodeExpression cvar, DataType type, Expression? expr, bool is_macro_definition = false) {
                if (type is DelegateType) {
                        CCodeExpression delegate_target_destroy_notify;
                        var delegate_target = get_delegate_target_cexpression (expr, out delegate_target_destroy_notify);

diff --git a/codegen/valagobjectmodule.vala b/codegen/valagobjectmodule.vala
index feadc0745f4090568f07e6c8e695d12243807143..0894b03c1ab7e79be733349eeea369e7c3a0d9d5 100644 (file)
--- a/codegen/valagobjectmodule.vala
+++ b/codegen/valagobjectmodule.vala
@@ -188,7 +188,7 @@ internal class Vala.GObjectModule : GTypeModule {
                cdecl.add_declarator (new CCodeVariableDeclarator ("self", ccall));
                block.add_statement (cdecl);
 
-               bool boxed_declared = false;
+               int boxed_name_id = 0;
                bool length_declared = false;
 
                var cswitch = new CCodeSwitchStatement (new CCodeIdentifier ("property_id"));
@@ -220,26 +220,28 @@ internal class Vala.GObjectModule : GTypeModule {
 
                        cswitch.add_statement (new CCodeCaseStatement (new CCodeIdentifier (prop.get_upper_case_cname ())));
                        if (prop.property_type.is_real_struct_type ()) {
-                               if (!boxed_declared) {
-                                       cdecl = new CCodeDeclaration ("gpointer");
-                                       cdecl.add_declarator (new CCodeVariableDeclarator ("boxed"));
-                                       block.add_statement (cdecl);
-                                       boxed_declared = true;
-                               }
-
                                var st = prop.property_type.data_type as Struct;
-                               var struct_creation = new CCodeFunctionCall (new CCodeIdentifier ("g_new0"));
-                               struct_creation.add_argument (new CCodeIdentifier (st.get_cname ()));
-                               struct_creation.add_argument (new CCodeConstant ("1"));
-                               cswitch.add_statement (new CCodeExpressionStatement (new CCodeAssignment (new CCodeIdentifier ("boxed"), struct_creation)));
+                               var boxed = "boxed%d".printf (boxed_name_id++);
+
+                               cdecl = new CCodeDeclaration (st.get_cname ());
+                               cdecl.add_declarator (new CCodeVariableDeclarator (boxed));
+                               block.add_statement (cdecl);
+
                                ccall = new CCodeFunctionCall (new CCodeIdentifier ("%s_get_%s".printf (prefix, prop.name)));
                                ccall.add_argument (cself);
-                               ccall.add_argument (new CCodeIdentifier ("boxed"));
+                               var boxed_addr = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier (boxed));
+                               ccall.add_argument (boxed_addr);
                                cswitch.add_statement (new CCodeExpressionStatement (ccall));
-                               var csetcall = new CCodeFunctionCall (new CCodeIdentifier ("g_value_take_boxed"));
+
+                               var csetcall = new CCodeFunctionCall ();
+                               csetcall.call = head.get_value_setter_function (prop.property_type);
                                csetcall.add_argument (new CCodeIdentifier ("value"));
-                               csetcall.add_argument (new CCodeIdentifier ("boxed"));
+                               csetcall.add_argument (boxed_addr);
                                cswitch.add_statement (new CCodeExpressionStatement (csetcall));
+
+                               if (requires_destroy (prop.get_accessor.value_type)) {
+                                       cswitch.add_statement (new CCodeExpressionStatement (get_unref_expression (new CCodeIdentifier (boxed), prop.get_accessor.value_type, null)));
+                               }
                        } else {
                                ccall = new CCodeFunctionCall (new CCodeIdentifier ("%s_get_%s".printf (prefix, prop.name)));
                                ccall.add_argument (cself);