Fix crash when using out parameters in delegates, fixes bug 563705

2008-12-16  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodemethodcallmodule.vala:

	Fix crash when using out parameters in delegates,
	fixes bug 563705

svn path=/trunk/; revision=2181

diff --git a/ChangeLog b/ChangeLog
index 70efe67248e095420b1a82e15ee3652c6b35ad2a..cb7b3614c717d012855a2adcc0e1c16e7b4af94e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-16  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valaccodemethodcallmodule.vala:
+
+       Fix crash when using out parameters in delegates,
+       fixes bug 563705
+
 2008-12-16  Jürg Billeter  <j@bitron.ch>
 
        * vapi/packages/gstreamer-0.10/:

diff --git a/gobject/valaccodemethodcallmodule.vala b/gobject/valaccodemethodcallmodule.vala
index cba212ee519f5257605537cdfc7a6ad1b0e7fa96..95b05ab4015b92870b9482b38f3fb35e3d7d4b7c 100644 (file)
--- a/gobject/valaccodemethodcallmodule.vala
+++ b/gobject/valaccodemethodcallmodule.vala
@@ -258,10 +258,10 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
 
                                                // call function
                                                LocalVariable ret_temp_var = null;
-                                               if (m.return_type is VoidType) {
+                                               if (itype.get_return_type () is VoidType) {
                                                        ccomma.append_expression (ccall_expr);
                                                } else {
-                                                       ret_temp_var = get_temp_variable (m.return_type);
+                                                       ret_temp_var = get_temp_variable (itype.get_return_type ());
                                                        temp_vars.insert (0, ret_temp_var);
                                                        ccomma.append_expression (new CCodeAssignment (new CCodeIdentifier (ret_temp_var.name), ccall_expr));
                                                }
@@ -282,7 +282,7 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                                                ccomma.append_expression (new CCodeAssignment ((CCodeExpression) unary.inner.ccodenode, cassign_comma));
 
                                                // return value
-                                               if (!(m.return_type is VoidType)) {
+                                               if (!(itype.get_return_type () is VoidType)) {
                                                        ccomma.append_expression (new CCodeIdentifier (ret_temp_var.name));
                                                }