Fix bug introduced in last commit

2008-12-15  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodestructmodule.vala:

	Fix bug introduced in last commit

svn path=/trunk/; revision=2155

diff --git a/ChangeLog b/ChangeLog
index 1e37304115eccef76ba3f4821d6c8a0b08b758c0..3a478ef0bdf3994611dd8cf817972d962bc9b804 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-15  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valaccodestructmodule.vala:
+
+       Fix bug introduced in last commit
+
 2008-12-15  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodestructmodule.vala:

diff --git a/gobject/valaccodestructmodule.vala b/gobject/valaccodestructmodule.vala
index c9cdad94cfaaf410ab91d786314079ae9879c9f8..24675bbb8e06b7572c97cb6c91ab321fb98ec6ad 100644 (file)
--- a/gobject/valaccodestructmodule.vala
+++ b/gobject/valaccodestructmodule.vala
@@ -183,10 +183,12 @@ public class Vala.CCodeStructModule : CCodeBaseModule {
                                cblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (dest, copy)));
 
                                var array_type = f.field_type as ArrayType;
-                               for (int dim = 1; dim <= array_type.rank; dim++) {
-                                       var len_src = new CCodeMemberAccess.pointer (new CCodeIdentifier ("self"), get_array_length_cname (f.name, dim));
-                                       var len_dest = new CCodeMemberAccess.pointer (new CCodeIdentifier ("dest"), get_array_length_cname (f.name, dim));
-                                       cblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (len_dest, len_src)));
+                               if (array_type != null) {
+                                       for (int dim = 1; dim <= array_type.rank; dim++) {
+                                               var len_src = new CCodeMemberAccess.pointer (new CCodeIdentifier ("self"), get_array_length_cname (f.name, dim));
+                                               var len_dest = new CCodeMemberAccess.pointer (new CCodeIdentifier ("dest"), get_array_length_cname (f.name, dim));
+                                               cblock.add_statement (new CCodeExpressionStatement (new CCodeAssignment (len_dest, len_src)));
+                                       }
                                }
                        }
                }