From 92530e35e8cee3b6f22d821cabe3f014fd5a0876 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Wed, 6 Aug 2008 13:09:17 +0000 Subject: [PATCH] Fix crash when using foreach with stacked arrays, fixes bug 546450 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-08-06 Jürg Billeter * gobject/valaccodegenerator.vala: Fix crash when using foreach with stacked arrays, fixes bug 546450 svn path=/trunk/; revision=1736 --- ChangeLog | 6 ++++++ gobject/valaccodegenerator.vala | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c64bf79..91a4f7f 100644 --- 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 + + * gobject/valaccodegenerator.vala: + Fix crash when using VAPI properties outside of a class 2008-08-05 Thijs Vermeir diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala index b044937..40b7a5c 100644 --- 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); -- 2.7.4