From: Jürg Billeter <j@bitron.ch>
Date: Fri, 16 Mar 2007 21:26:41 +0000 (+0000)
Subject: fix null pointer dereference when emitting signals
X-Git-Tag: VALA_0_0_8~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3a3fa6f20ee78ed32b0d20b510e8cf13279e92b;p=thirdparty%2Fvala.git

fix null pointer dereference when emitting signals

2007-03-16  Jürg Billeter  <j@bitron.ch>

	* vala/valacodegenerator.vala: fix null pointer dereference when
	  emitting signals

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

diff --git a/vala/ChangeLog b/vala/ChangeLog
index 40054e96f..6da0106a6 100644
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-16  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valacodegenerator.vala: fix null pointer dereference when
+	  emitting signals
+
 2007-03-16  Jürg Billeter  <j@bitron.ch>
 
 	* vala/parser.y: default to strong references for method return types
diff --git a/vala/vala/valacodegenerator.vala b/vala/vala/valacodegenerator.vala
index 7bef9255e..178478037 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 ()) {