diff options
Diffstat (limited to 'gcc/d')
| -rw-r--r-- | gcc/d/expr.cc | 6 | ||||
| -rw-r--r-- | gcc/d/modules.cc | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc index 7038655..551d004 100644 --- a/gcc/d/expr.cc +++ b/gcc/d/expr.cc @@ -2535,13 +2535,13 @@ public: { /* Copy the string contents to a null terminated string. */ dinteger_t length = (e->len * e->sz); - char *string = XALLOCAVEC (char, length + 1); + char *string = XALLOCAVEC (char, length + e->sz); + memset (string, 0, length + e->sz); if (length > 0) memcpy (string, e->string, length); - string[length] = '\0'; /* String value and type includes the null terminator. */ - tree value = build_string (length, string); + tree value = build_string (length + e->sz, string); TREE_TYPE (value) = make_array_type (tb->nextOf (), length + 1); value = build_address (value); diff --git a/gcc/d/modules.cc b/gcc/d/modules.cc index f2180d3..8d6c8f0 100644 --- a/gcc/d/modules.cc +++ b/gcc/d/modules.cc @@ -277,12 +277,13 @@ get_compiler_dso_type (void) DECL_CHAIN (field) = fields; fields = field; - field = create_field_decl (build_pointer_type (get_moduleinfo_type ()), - NULL, 1, 1); + tree moduleinfo_ptr_ptr_type = + build_pointer_type (build_pointer_type (get_moduleinfo_type ())); + + field = create_field_decl (moduleinfo_ptr_ptr_type, NULL, 1, 1); DECL_CHAIN (field) = fields; fields = field; - field = create_field_decl (build_pointer_type (get_moduleinfo_type ()), - NULL, 1, 1); + field = create_field_decl (moduleinfo_ptr_ptr_type, NULL, 1, 1); DECL_CHAIN (field) = fields; fields = field; |