vala r1923 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Sat Oct 25 15:34:23 2008
New Revision: 1923
URL: http://svn.gnome.org/viewvc/vala?rev=1923&view=rev

Log:
2008-10-25  JÃrg Billeter  <j bitron ch>

	* gobject/valaccodegenerator.vala:

	Fix crash when using delegates in combination with pointer types,
	fixes bug 557728


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodegenerator.vala

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Sat Oct 25 15:34:23 2008
@@ -2901,17 +2901,13 @@
 
 				var ma = (MemberAccess) delegate_expr;
 
-				TypeSymbol base_type = null;
+				var base_type = ma.inner.value_type;
 				CCodeExpression target_expr = null;
 
 				var pub_inst = (CCodeExpression) get_ccodenode (ma.inner);
 
-				if (ma.inner.value_type != null) {
-					base_type = ma.inner.value_type.data_type;
-				}
-
 				if (field.binding == MemberBinding.INSTANCE) {
-					var instance_expression_type = get_data_type_for_symbol (base_type);
+					var instance_expression_type = base_type;
 					var instance_target_type = get_data_type_for_symbol ((TypeSymbol) field.parent_symbol);
 					CCodeExpression typed_inst = transform_expression (pub_inst, instance_expression_type, instance_target_type);