fix crash when using arrays for D-Bus method calls

2008-03-15  Juerg Billeter  <j@bitron.ch>

	* gobject/valaccodegeneratorinvocationexpression.vala: fix crash
	  when using arrays for D-Bus method calls

svn path=/trunk/; revision=1128

diff --git a/ChangeLog b/ChangeLog
index 83c06da..a08e32e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-03-15  Jürg Billeter  <j@bitron.ch>
 
+       * gobject/valaccodegeneratorinvocationexpression.vala: fix crash
+         when using arrays for D-Bus method calls
+
+2008-03-15  Jürg Billeter  <j@bitron.ch>
+
        * gobject/valaccodegenerator.vala,
          gobject/valaccodegeneratormemberaccess.vala,
          gobject/valaccodegeneratormethod.vala: fix runtime crash when

diff --git a/gobject/valaccodegeneratorinvocationexpression.vala b/gobject/valaccodegeneratorinvocationexpression.vala
index bf0ee07..bcda0d2 100644 (file)
--- a/gobject/valaccodegeneratorinvocationexpression.vala
+++ b/gobject/valaccodegeneratorinvocationexpression.vala
@@ -503,9 +503,10 @@ public class Vala.CCodeGenerator {
                        ccomma.append_expression (cndupcall);
 
                        expr.ccodenode = ccomma;
-               } else if (m is DBusMethod && m.return_type.data_type != null) {
+               } else if (m is DBusMethod && !(m.return_type is VoidType)) {
                        // synchronous D-Bus method call with reply
                        if (m.return_type is ArrayType && ((ArrayType) m.return_type).element_type.data_type != string_type.data_type) {
+                               // non-string arrays (use GArray)
                                var array_type = (ArrayType) m.return_type;
 
                                ccall.add_argument (get_dbus_array_type (array_type));
@@ -527,8 +528,16 @@ public class Vala.CCodeGenerator {
                                } else {
                                        expr.append_array_size (new CCodeConstant ("-1"));
                                }
-                       } else {
-                               ccall.add_argument (new CCodeIdentifier (m.return_type.data_type.get_type_id ()));
+                       } else if (m.return_type is ArrayType || m.return_type.data_type != null) {
+                               // string arrays or other datatypes
+
+                               if (m.return_type is ArrayType) {
+                                       // string arrays
+                                       ccall.add_argument (new CCodeIdentifier ("G_TYPE_STRV"));
+                               } else {
+                                       // other types
+                                       ccall.add_argument (new CCodeIdentifier (m.return_type.data_type.get_type_id ()));
+                               }
 
                                var temp_decl = get_temp_variable_declarator (m.return_type);
                                temp_vars.insert (0, temp_decl);