Fix crash on incremental parsing, patch by Abderrahim Kitouni

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

	* vala/valatypesymbol.vala:

	Fix crash on incremental parsing, patch by Abderrahim Kitouni

svn path=/trunk/; revision=1732

diff --git a/ChangeLog b/ChangeLog
index ea24f40..166e54d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-08-04  Jürg Billeter  <j@bitron.ch>
 
+       * vala/valatypesymbol.vala:
+
+       Fix crash on incremental parsing, patch by Abderrahim Kitouni
+
+2008-08-04  Jürg Billeter  <j@bitron.ch>
+
        * vapi/glib-2.0.vapi:
 
        Fix g_object_get and g_object_set bindings

diff --git a/THANKS b/THANKS
index 450afa9..4dc6fc4 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,5 +1,6 @@
 The Vala team would like to thank the following contributors:
 
+Abderrahim Kitouni
 Alberto Ruiz
 Alexandre Moreira
 Ali Sabil

diff --git a/vala/valatypesymbol.vala b/vala/valatypesymbol.vala
index fdbc9c8..00725b8 100644 (file)
--- a/vala/valatypesymbol.vala
+++ b/vala/valatypesymbol.vala
@@ -192,7 +192,8 @@ public abstract class Vala.TypeSymbol : Symbol {
        }
 
        public override Gee.List<string> get_cheader_filenames () {
-               if (cheader_filenames.size == 0) {
+               // parent_symbol can be null on incremental parsing
+               if (cheader_filenames.size == 0 && parent_symbol != null) {
                        /* default to header filenames of the namespace */
                        foreach (string filename in parent_symbol.get_cheader_filenames ()) {
                                add_cheader_filename (filename);