fix null dereference when trying to access members of a delegate

2008-01-12  Juerg Billeter  <j@bitron.ch>

	* vala/valasemanticanalyzer.vala: fix null dereference when trying to
	  access members of a delegate

svn path=/trunk/; revision=832

diff --git a/ChangeLog b/ChangeLog
index 08c3afa7108130ce9ff78469eae1b04fa6cb83cb..be04f5f389dbdfbea7de934f549feb55de1d3a8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-12  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valasemanticanalyzer.vala: fix null dereference when trying to
+         access members of a delegate
+
 2008-01-11  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodegeneratorclass.vala,

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index 4dc60ae6195199c52cd61ac251c3100d58d11dad..f1037ee26cd5d363a35a050ce0aea8d4e9686cea 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -1336,7 +1336,9 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                                        expr.symbol_reference = expr.inner.static_type.get_pointer_member (expr.member_name);
                                } else {
                                        base_symbol = expr.inner.static_type.data_type;
-                                       expr.symbol_reference = symbol_lookup_inherited (base_symbol, expr.member_name);
+                                       if (base_symbol != null) {
+                                               expr.symbol_reference = symbol_lookup_inherited (base_symbol, expr.member_name);
+                                       }
                                }
                                if (expr.symbol_reference != null) {
                                        // inner expression is variable, field, or parameter