Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-11 23:07:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #81 - Complete fix for string->utf8

Browse source
This commit is contained in:
Justin Ethier 2018-01-02 17:39:13 -05:00
parent 528f545b5c
commit a700b4094a
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
runtime.c
View file

@ -2714,12 +2714,11 @@ object Cyc_string2utf8(void *data, object cont, object str, object start,
_return_closcall1(data, cont, &result); _return_closcall1(data, cont, &result);
} }
} else { } else {
// TODO: if len > MAX_STACK_OBJ
make_empty_bytevector(result);
const char *tmp = string_str(str); const char *tmp = string_str(str);
char_type codepoint; char_type codepoint;
uint32_t state = 0; uint32_t state = 0;
int num_ch, cur_ch_bytes = 0, start_i = 0, end_i = 0; int num_ch, cur_ch_bytes = 0, start_i = 0, end_i = 0;
// Figure out start / end indices
for (num_ch = 0; *tmp; ++tmp){ for (num_ch = 0; *tmp; ++tmp){
cur_ch_bytes++; cur_ch_bytes++;
if (!Cyc_utf8_decode(&state, &codepoint, (uint8_t)*tmp)){ if (!Cyc_utf8_decode(&state, &codepoint, (uint8_t)*tmp)){
@ -2735,10 +2734,28 @@ object Cyc_string2utf8(void *data, object cont, object str, object start,
} }
} }
} }
result.len = end_i - start_i; len = end_i - start_i;
result.data = alloca(sizeof(char) * result.len); if (len >= MAX_STACK_OBJ) {
memcpy(&result.data[0], &(string_str(str))[start_i], result.len); int heap_grown;
_return_closcall1(data, cont, &result); object bv = gc_alloc(((gc_thread_data *)data)->heap,
sizeof(bytevector_type) + len,
boolean_f, // OK to populate manually over here
(gc_thread_data *)data,
&heap_grown);
((bytevector) bv)->hdr.mark = ((gc_thread_data *)data)->gc_alloc_color;
((bytevector) bv)->hdr.grayed = 0;
((bytevector) bv)->tag = bytevector_tag;
((bytevector) bv)->len = len;
((bytevector) bv)->data = (char *)(((char *)bv) + sizeof(bytevector_type));
memcpy(&(((bytevector) bv)->data[0]), &(string_str(str))[start_i], len);
_return_closcall1(data, cont, bv);
} else {
make_empty_bytevector(result);
result.len = len;
result.data = alloca(sizeof(char) * result.len);
memcpy(&result.data[0], &(string_str(str))[start_i], result.len);
_return_closcall1(data, cont, &result);
}
} }
} }