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 40054e96f8db656f91bca50b985bf7d9b691676f..6da0106a602e68d60131ba619026090a7c3a16d4 100644 (file)
--- 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 7bef9255edbec3cf1c1348e7c7c4cd409e297d26..178478037e480b63d97132055d4a41cf4bbc37d6 100644 (file)
--- 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 ()) {