diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2017-02-12 23:08:12 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-02-13 07:54:25 +0100 |
| commit | a76cebe116ec2663ee1ee5dabc28f59477ce7993 (patch) | |
| tree | 5ca414e6148afeb7e9910b708c3ded5c983ac02c | |
| parent | 1b2e0c292450ea025f2911a05a3b2b36d2f3552c (diff) | |
| download | vala-a76cebe116ec2663ee1ee5dabc28f59477ce7993.tar.gz | |
gdbus: Initialize intermediate variables
Those may be left uninitialized after error handling paths are introduced,
so invalid data might be attempted to be freed later on.
https://bugzilla.gnome.org/show_bug.cgi?id=778540
| -rw-r--r-- | codegen/valagdbusclientmodule.vala | 4 | ||||
| -rw-r--r-- | codegen/valagdbusservermodule.vala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/codegen/valagdbusclientmodule.vala b/codegen/valagdbusclientmodule.vala index 86d42595e..6fdda8a50 100644 --- a/codegen/valagdbusclientmodule.vala +++ b/codegen/valagdbusclientmodule.vala @@ -795,7 +795,7 @@ public class Vala.GDBusClientModule : GDBusModule { foreach (Parameter param in m.get_parameters ()) { if (param.direction == ParameterDirection.OUT) { - ccode.add_declaration (get_ccode_name (param.variable_type), new CCodeVariableDeclarator ("_vala_%s".printf (param.name))); + ccode.add_declaration (get_ccode_name (param.variable_type), new CCodeVariableDeclarator.zero ("_vala_%s".printf (param.name), default_value_for_type (param.variable_type, true))); var array_type = param.variable_type as ArrayType; @@ -834,7 +834,7 @@ public class Vala.GDBusClientModule : GDBusModule { var target = new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("result")); receive_dbus_value (m.return_type, new CCodeIdentifier ("_reply_message"), new CCodeIdentifier ("_reply_iter"), target, m); } else { - ccode.add_declaration (get_ccode_name (m.return_type), new CCodeVariableDeclarator ("_result")); + ccode.add_declaration (get_ccode_name (m.return_type), new CCodeVariableDeclarator.zero ("_result", default_value_for_type (m.return_type, true))); var array_type = m.return_type as ArrayType; diff --git a/codegen/valagdbusservermodule.vala b/codegen/valagdbusservermodule.vala index 617df210b..4a20a2d92 100644 --- a/codegen/valagdbusservermodule.vala +++ b/codegen/valagdbusservermodule.vala @@ -237,7 +237,7 @@ public class Vala.GDBusServerModule : GDBusClientModule { ccode.close (); } - ccode.add_declaration ("GDBusMessage*", new CCodeVariableDeclarator ("_reply_message")); + ccode.add_declaration ("GDBusMessage*", new CCodeVariableDeclarator.zero ("_reply_message", new CCodeConstant ("NULL"))); var message_expr = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_method_invocation_get_message")); message_expr.add_argument (new CCodeIdentifier ("invocation")); |