From: Juerg Billeter <j@bitron.ch>
Date: Wed, 26 Dec 2007 10:56:51 +0000 (+0000)
Subject: fix crash on unresolved type name, fixes bug 504014
X-Git-Tag: VALA_0_1_6~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=168dd4cf12f9d14aa2abd3f100469f8e53b07322;p=thirdparty%2Fvala.git

fix crash on unresolved type name, fixes bug 504014

2007-12-26  Juerg Billeter  <j@bitron.ch>

	* vala/valasymbolresolver.vala: fix crash on unresolved type name,
	  fixes bug 504014

svn path=/trunk/; revision=793
---

diff --git a/ChangeLog b/ChangeLog
index c5fe09a29..67321440a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-26  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valasymbolresolver.vala: fix crash on unresolved type name,
+	  fixes bug 504014
+
 2007-12-26  Roberto Majadas  <telemaco@openshine.com>
 
 	* vapi/Makefile.am, vapi/liboobs-1.vapi, vapi/packages/liboobs-1/: add
diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala
index 8fd0f2630..693427804 100644
--- a/vala/valasymbolresolver.vala
+++ b/vala/valasymbolresolver.vala
@@ -91,7 +91,7 @@ public class Vala.SymbolResolver : CodeVisitor {
 		iface.accept_children (this);
 
 		foreach (DataType type in iface.get_prerequisites ()) {
-			if (type.data_type.is_subtype_of (iface)) {
+			if (type.data_type != null && type.data_type.is_subtype_of (iface)) {
 				iface.error = true;
 				Report.error (type.source_reference, "Prerequisite cycle (`%s' and `%s')".printf (iface.get_full_name (), type.data_type.get_full_name ()));
 				return;
@@ -180,7 +180,7 @@ public class Vala.SymbolResolver : CodeVisitor {
 		}
 	}
 
-	private DataType resolve_type (UnresolvedType! unresolved_type) {
+	private DataType! resolve_type (UnresolvedType! unresolved_type) {
 		var type = new DataType ();
 		type.source_reference = unresolved_type.source_reference;
 		type.takes_ownership = unresolved_type.takes_ownership;
@@ -218,7 +218,7 @@ public class Vala.SymbolResolver : CodeVisitor {
 					if (local_sym != null) {
 						if (sym != null) {
 							Report.error (type.source_reference, "`%s' is an ambiguous reference between `%s' and `%s'".printf (unresolved_type.type_name, sym.get_full_name (), local_sym.get_full_name ()));
-							return null;
+							return new InvalidType ();
 						}
 						sym = local_sym;
 					}
@@ -226,7 +226,7 @@ public class Vala.SymbolResolver : CodeVisitor {
 			}
 			if (sym == null) {
 				Report.error (type.source_reference, "The type name `%s' could not be found".printf (unresolved_type.type_name));
-				return null;
+				return new InvalidType ();
 			}
 			if (sym is TypeParameter) {
 				type.type_parameter = (TypeParameter) sym;
@@ -238,20 +238,20 @@ public class Vala.SymbolResolver : CodeVisitor {
 				}
 			} else {
 				Report.error (type.source_reference, "`%s' is not a type".printf (sym.get_full_name ()));
-				return null;
+				return new InvalidType ();
 			}
 		} else {
 			var ns_symbol = root_symbol.scope.lookup (unresolved_type.namespace_name);
 			if (ns_symbol == null) {
 				type.error = true;
 				Report.error (type.source_reference, "The namespace name `%s' could not be found".printf (unresolved_type.namespace_name));
-				return null;
+				return new InvalidType ();
 			}
 			
 			var sym = ns_symbol.scope.lookup (unresolved_type.type_name);
 			if (sym == null) {
 				Report.error (type.source_reference, "The type name `%s' does not exist in the namespace `%s'".printf (unresolved_type.type_name, unresolved_type.namespace_name));
-				return null;
+				return new InvalidType ();
 			}
 			if (sym is Typesymbol) {
 				if (sym is Callback) {
@@ -261,7 +261,7 @@ public class Vala.SymbolResolver : CodeVisitor {
 				}
 			} else {
 				Report.error (type.source_reference, "`%s' is not a type".printf (sym.get_full_name ()));
-				return null;
+				return new InvalidType ();
 			}
 		}
 
@@ -311,10 +311,7 @@ public class Vala.SymbolResolver : CodeVisitor {
 
 		var unresolved_type = (UnresolvedType) data_type;
 
-		var type = resolve_type (unresolved_type);
-		if (type != null) {
-			unresolved_type.parent_node.replace_type (unresolved_type, type);
-		}
+		unresolved_type.parent_node.replace_type (unresolved_type, resolve_type (unresolved_type));
 	}
 
 	public override void visit_variable_declarator (VariableDeclarator! decl) {