Bug 585328 - Only set zero_terminated flag for types we know are

Rationalize our setting of the zero_terminated flag; we shouldn't
set it if the gir doesn't say to.

diff --git a/girepository/girparser.c b/girepository/girparser.c
index 0ab6259..e5f5e75 100644 (file)
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -1710,6 +1710,12 @@ start_type (GMarkupParseContext *context,
       
       typenode->has_size = size != NULL;
       typenode->size = typenode->has_size ? atoi (size) : -1;
+
+      if (zero)
+        typenode->zero_terminated = strcmp(zero, "1") == 0;
+      else
+        /* If neither zero-terminated nor length nor fixed-size is given, assume zero-terminated. */
+        typenode->zero_terminated = !(typenode->has_length || typenode->has_size);
     }
   else
     {