Commit b9e790f89bcbb66f5dde552909e7540069500e25
2024-06-28T11:36:59
fix two segv in StructType (clean + must_clean)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121
diff --git a/ic3/.ic3_history b/ic3/.ic3_history
index fe346ab..1416cd4 100644
--- a/ic3/.ic3_history
+++ b/ic3/.ic3_history
@@ -95,3 +95,4 @@ quote [a: 1, b: 2]
quote [{:a, 1}, {:b, 2}]
%C3.Operator{}
%GL.Vertex{}
+%C3.Operator{}
diff --git a/libc3/struct_type.c b/libc3/struct_type.c
index 6a65922..9de6ad1 100644
--- a/libc3/struct_type.c
+++ b/libc3/struct_type.c
@@ -57,21 +57,22 @@ s_struct_type * struct_type_init (s_struct_type *st,
uw offset;
const s_list *s;
uw size;
+ s_struct_type tmp = {0};
const s_tuple *tuple;
const s_sym *type;
assert(st);
assert(module);
assert(spec);
count = list_length(spec);
- st->module = module;
- if (! map_init(&st->map, count))
+ tmp.module = module;
+ if (! map_init(&tmp.map, count))
return NULL;
- st->offset = alloc(count * sizeof(uw));
- if (! st->offset) {
- map_clean(&st->map);
+ tmp.offset = alloc(count * sizeof(uw));
+ if (! tmp.offset) {
+ map_clean(&tmp.map);
return NULL;
}
- st->must_clean = false;
+ tmp.must_clean = false;
offset = 0;
i = 0;
s = spec;
@@ -79,33 +80,34 @@ s_struct_type * struct_type_init (s_struct_type *st,
if (s->tag.type != TAG_TUPLE || s->tag.data.tuple.count != 2) {
err_puts("struct_type_init: invalid spec");
assert(! "struct_type_init: invalid spec");
- map_clean(&st->map);
- free(st->offset);
+ map_clean(&tmp.map);
+ free(tmp.offset);
return NULL;
}
tuple = &s->tag.data.tuple;
if (! tag_size(tuple->tag + 1, &size)) {
- map_clean(&st->map);
- free(st->offset);
+ map_clean(&tmp.map);
+ free(tmp.offset);
return NULL;
}
- tag_init_copy(st->map.key + i, tuple->tag + 0);
- tag_init_copy(st->map.value + i, tuple->tag + 1);
- tag_type(st->map.value + i, &type);
+ tag_init_copy(tmp.map.key + i, tuple->tag + 0);
+ tag_init_copy(tmp.map.value + i, tuple->tag + 1);
+ tag_type(tmp.map.value + i, &type);
if (! sym_must_clean(type, &must_clean)) {
- map_clean(&st->map);
- free(st->offset);
+ map_clean(&tmp.map);
+ free(tmp.offset);
return NULL;
}
if (must_clean)
- st->must_clean = true;
+ tmp.must_clean = true;
offset = struct_type_padding(offset, size);
- st->offset[i] = offset;
+ tmp.offset[i] = offset;
offset += size;
i++;
s = list_next(s);
}
- st->size = offset;
+ tmp.size = offset;
+ *st = tmp;
return st;
}
@@ -137,9 +139,11 @@ s_struct_type * struct_type_init_copy (s_struct_type *st,
assert(src);
assert(src->module);
assert(src->map.count);
- tmp.module = src->module;
+ tmp.clean = src->clean;
if (! map_init_copy(&tmp.map, &src->map))
return NULL;
+ tmp.module = src->module;
+ tmp.must_clean = src->must_clean;
tmp.offset = alloc(tmp.map.count * sizeof(uw));
if (! tmp.offset) {
map_clean(&tmp.map);
diff --git a/libc3/types.h b/libc3/types.h
index c7c875d..af5a9e9 100644
--- a/libc3/types.h
+++ b/libc3/types.h
@@ -379,12 +379,12 @@ struct str {
};
struct struct_type {
- const s_sym *module;
+ f_clean clean;
s_map map;
+ const s_sym *module;
bool must_clean;
uw *offset;
uw size;
- f_clean clean;
};
/* 3 */