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

string/utf8 - allow zero length results

Browse source
This commit is contained in:
Justin Ethier 2016-03-28 21:35:08 -04:00
parent 822ac63e9a
commit 9f4991724e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
runtime.c
View file

@ -1481,6 +1481,7 @@ object Cyc_bytevector_copy(void *data, object cont, object bv, object start, obj
buf = ((bytevector)bv)->data; buf = ((bytevector)bv)->data;
s = obj_is_int(start) ? obj_obj2int(start) : integer_value(start); s = obj_is_int(start) ? obj_obj2int(start) : integer_value(start);
e = obj_is_int(end) ? obj_obj2int(end) : integer_value(end); e = obj_is_int(end) ? obj_obj2int(end) : integer_value(end);
len = e - s;
if (s < 0 || s >= ((bytevector)bv)->len) { if (s < 0 || s >= ((bytevector)bv)->len) {
Cyc_rt_raise2(data, "bytevector-copy - invalid start", start); Cyc_rt_raise2(data, "bytevector-copy - invalid start", start);
@ -1490,7 +1491,6 @@ object Cyc_bytevector_copy(void *data, object cont, object bv, object start, obj
Cyc_rt_raise2(data, "bytevector-copy - invalid end", end); Cyc_rt_raise2(data, "bytevector-copy - invalid end", end);
} }
len = e - s;
result.len = len; result.len = len;
result.data = alloca(sizeof(char) * len); result.data = alloca(sizeof(char) * len);
memcpy(&result.data[0], &(((bytevector)bv)->data)[s], len); memcpy(&result.data[0], &(((bytevector)bv)->data)[s], len);
@ -1509,8 +1509,9 @@ object Cyc_utf82string(void *data, object cont, object bv, object start, object
buf = ((bytevector)bv)->data; buf = ((bytevector)bv)->data;
s = obj_is_int(start) ? obj_obj2int(start) : integer_value(start); s = obj_is_int(start) ? obj_obj2int(start) : integer_value(start);
e = obj_is_int(end) ? obj_obj2int(end) : integer_value(end); e = obj_is_int(end) ? obj_obj2int(end) : integer_value(end);
len = e - s;
if (s < 0 || s >= ((bytevector)bv)->len) { if (s < 0 || (s >= ((bytevector)bv)->len && len > 0)) {
Cyc_rt_raise2(data, "utf8->string - invalid start", start); Cyc_rt_raise2(data, "utf8->string - invalid start", start);
} }
@ -1518,7 +1519,6 @@ object Cyc_utf82string(void *data, object cont, object bv, object start, object
Cyc_rt_raise2(data, "utf8->string - invalid end", end); Cyc_rt_raise2(data, "utf8->string - invalid end", end);
} }
len = e - s;
{ {
make_string_noalloc(st, NULL, len); make_string_noalloc(st, NULL, len);
st.str = alloca(sizeof(char) * (len + 1)); st.str = alloca(sizeof(char) * (len + 1));
@ -1541,8 +1541,9 @@ object Cyc_string2utf8(void *data, object cont, object str, object start, object
buf = string_str(str); buf = string_str(str);
s = obj_is_int(start) ? obj_obj2int(start) : integer_value(start); s = obj_is_int(start) ? obj_obj2int(start) : integer_value(start);
e = obj_is_int(end) ? obj_obj2int(end) : integer_value(end); e = obj_is_int(end) ? obj_obj2int(end) : integer_value(end);
len = e - s;
if (s < 0 || s >= string_len(str)) { if (s < 0 || (s >= string_len(str) && len > 0)) {
Cyc_rt_raise2(data, "string->utf8 - invalid start", start); Cyc_rt_raise2(data, "string->utf8 - invalid start", start);
} }
@ -1550,7 +1551,6 @@ object Cyc_string2utf8(void *data, object cont, object str, object start, object
Cyc_rt_raise2(data, "string->utf8 - invalid end", end); Cyc_rt_raise2(data, "string->utf8 - invalid end", end);
} }
len = e - s;
result.len = len; result.len = len;
result.data = alloca(sizeof(char) * len); result.data = alloca(sizeof(char) * len);
memcpy(&result.data[0], &(string_str(str))[s], len); memcpy(&result.data[0], &(string_str(str))[s], len);