Fix crash when using foreach with stacked arrays, fixes bug 546450

2008-08-06  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodegenerator.vala:

	Fix crash when using foreach with stacked arrays, fixes bug 546450

svn path=/trunk/; revision=1736

diff --git a/ChangeLog b/ChangeLog
index c64bf79..91a4f7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
        * gobject/valaccodegenerator.vala:
 
+       Fix crash when using foreach with stacked arrays, fixes bug 546450
+
+2008-08-06  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valaccodegenerator.vala:
+
        Fix crash when using VAPI properties outside of a class
 
 2008-08-05  Thijs Vermeir  <thijsvermeir@gmail.com>

diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala
index b044937..40b7a5c 100644 (file)
--- a/gobject/valaccodegenerator.vala
+++ b/gobject/valaccodegenerator.vala
@@ -2129,7 +2129,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
                                
                                /* only check for null if the containers elements are of reference-type */
                                CCodeBinaryExpression ccond;
-                               if (array_type.element_type.data_type.is_reference_type ()) {
+                               if (array_type.element_type.is_reference_type_or_type_parameter ()) {
                                        var ccond_term1 = new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY, array_len, new CCodeConstant ("-1"));
                                        var ccond_term2 = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeElementAccess (new CCodeIdentifier (collection_backup.name), new CCodeIdentifier (it_name)), new CCodeConstant ("NULL"));
                                        var ccond_term = new CCodeBinaryExpression (CCodeBinaryOperator.AND, ccond_term1, ccond_term2);