Commit e8ebe7e20afee503c273ab35c7134b7cd1e9c158
2023-12-21T04:01:40
wip asan
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
diff --git a/.ic3_history b/.ic3_history
index 23be3b4..1ad0184 100644
--- a/.ic3_history
+++ b/.ic3_history
@@ -35,3 +35,6 @@ Map.map
Map.to_list
make
%GL.Sphere{}
+a = (U8) {0, 1}
+a[0]
+a[1]
diff --git a/Makefile b/Makefile
index 4ecbe6c..06582d5 100644
--- a/Makefile
+++ b/Makefile
@@ -144,6 +144,9 @@ gen:
ic3:
${MAKE} -C ic3 build
+ic3_asan:
+ ${MAKE} -C ic3 asan
+
ic3_debug:
${MAKE} -C ic3 debug
diff --git a/libc3/list.c b/libc3/list.c
index 2401c4f..619a731 100644
--- a/libc3/list.c
+++ b/libc3/list.c
@@ -271,45 +271,47 @@ s_array * list_to_array (const s_list *list, const s_sym *type,
assert(! "list_to_array: zero item size");
return NULL;
}
- tmp.dimension = 1;
tmp.type = type;
- tmp.dimensions = calloc(1, sizeof(s_array_dimension));
- if (! tmp.dimensions) {
- err_puts("list_to_array: out of memory: 1");
- assert(! "list_to_array: out of memory: 1");
- return NULL;
- }
- tmp.count = len;
- tmp.dimensions[0].count = len;
- tmp.dimensions[0].item_size = size;
- tmp.size = len * size;
- tmp.data = calloc(len, size);
- if (! tmp.data) {
- err_puts("list_to_array: out of memory: 2");
- assert(! "list_to_array: out of memory: 2");
- free(tmp.dimensions);
- return NULL;
- }
- if (! sym_to_init_copy(type, &init_copy)) {
- free(tmp.data);
- free(tmp.dimensions);
- return NULL;
- }
- data = tmp.data;
- l = list;
- while (l) {
- if (! tag_to_const_pointer(&l->tag, type, &data_list))
- goto ko;
- if (data_list) {
- if (init_copy) {
- if (! init_copy(data, data_list))
- goto ko;
+ if (len) {
+ tmp.dimension = 1;
+ tmp.dimensions = calloc(1, sizeof(s_array_dimension));
+ if (! tmp.dimensions) {
+ err_puts("list_to_array: out of memory: 1");
+ assert(! "list_to_array: out of memory: 1");
+ return NULL;
+ }
+ tmp.count = len;
+ tmp.dimensions[0].count = len;
+ tmp.dimensions[0].item_size = size;
+ tmp.size = len * size;
+ tmp.data = calloc(len, size);
+ if (! tmp.data) {
+ err_puts("list_to_array: out of memory: 2");
+ assert(! "list_to_array: out of memory: 2");
+ free(tmp.dimensions);
+ return NULL;
+ }
+ if (! sym_to_init_copy(type, &init_copy)) {
+ free(tmp.data);
+ free(tmp.dimensions);
+ return NULL;
+ }
+ data = tmp.data;
+ l = list;
+ while (l) {
+ if (! tag_to_const_pointer(&l->tag, type, &data_list))
+ goto ko;
+ if (data_list) {
+ if (init_copy) {
+ if (! init_copy(data, data_list))
+ goto ko;
+ }
+ else
+ memcpy(data, data_list, size);
}
- else
- memcpy(data, data_list, size);
+ data += size;
+ l = list_next(l);
}
- data += size;
- l = list_next(l);
}
*dest = tmp;
return dest;