vala r817 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Wed Jan  9 22:21:33 2008
New Revision: 817
URL: http://svn.gnome.org/viewvc/vala?rev=817&view=rev

Log:
2008-01-09  Juerg Billeter  <j bitron ch>

	* vala/valadatatype.vala: fix crash when data_type property is null


Modified:
   trunk/ChangeLog
   trunk/vala/valadatatype.vala

Modified: trunk/vala/valadatatype.vala
==============================================================================
--- trunk/vala/valadatatype.vala	(original)
+++ trunk/vala/valadatatype.vala	Wed Jan  9 22:21:33 2008
@@ -344,10 +344,11 @@
 		if (target_type is PointerType || (target_type.data_type != null && target_type.data_type.get_attribute ("PointerType") != null)) {
 			/* any reference or array type or pointer type can be cast to a generic pointer */
 			if (type_parameter != null ||
-				data_type.is_reference_type () ||
-				data_type is Array ||
-				data_type is Callback ||
-				data_type.get_attribute ("PointerType") != null) {
+				(data_type != null && (
+					data_type.is_reference_type () ||
+					data_type is Array ||
+					data_type is Callback ||
+					data_type.get_attribute ("PointerType") != null))) {
 				return true;
 			}