From: Jürg Billeter <j@bitron.ch>
Date: Tue, 16 Dec 2008 18:22:29 +0000 (+0000)
Subject: Fix crash when using out parameters in delegates, fixes bug 563705
X-Git-Tag: VALA_0_5_3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae7878f5061d8a450ff6f5495d784f5bccc527e7;p=thirdparty%2Fvala.git

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 70efe6724..cb7b3614c 100644
--- 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 cba212ee5..95b05ab40 100644
--- 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));
 						}