From b3a3fa6f20ee78ed32b0d20b510e8cf13279e92b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Fri, 16 Mar 2007 21:26:41 +0000 Subject: [PATCH] fix null pointer dereference when emitting signals MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2007-03-16 Jürg Billeter * vala/valacodegenerator.vala: fix null pointer dereference when emitting signals svn path=/trunk/; revision=236 --- vala/ChangeLog | 5 +++++ vala/vala/valacodegenerator.vala | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/vala/ChangeLog b/vala/ChangeLog index 40054e9..6da0106 100644 --- a/vala/ChangeLog +++ b/vala/ChangeLog @@ -1,5 +1,10 @@ 2007-03-16 Jürg Billeter + * vala/valacodegenerator.vala: fix null pointer dereference when + emitting signals + +2007-03-16 Jürg Billeter + * vala/parser.y: default to strong references for method return types * vala/valasymbolresolver.vala: reset TypeReference.transfers_ownership for value-types diff --git a/vala/vala/valacodegenerator.vala b/vala/vala/valacodegenerator.vala index 7bef925..1784780 100644 --- a/vala/vala/valacodegenerator.vala +++ b/vala/vala/valacodegenerator.vala @@ -3211,7 +3211,7 @@ public class Vala.CodeGenerator : CodeVisitor { expr.ccodenode = new CCodeAssignment (instance, ccall); } else { /* cast pointer to actual type if this is a generic method return value */ - if (m.return_type.type_parameter != null && expr.static_type.data_type != null) { + if (m != null && m.return_type.type_parameter != null && expr.static_type.data_type != null) { if (expr.static_type.data_type is Struct) { var st = (Struct) expr.static_type.data_type; if (st == bool_type.data_type || st.is_integer_type ()) { -- 2.7.4