Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 05:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't allow trailing data after the number in string->number, even if a valid delimiter (fixes issue #811)

Browse source
This commit is contained in:
Alex Shinn 2022-02-04 12:34:55 +09:00
parent a127a332ac
commit 07358ff8b7
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sexp.c
View file

@ -3751,7 +3751,7 @@ sexp sexp_read_from_string (sexp ctx, const char *str, sexp_sint_t len) {
sexp sexp_string_to_number_op (sexp ctx, sexp self, sexp_sint_t n, sexp str, sexp b) { sexp sexp_string_to_number_op (sexp ctx, sexp self, sexp_sint_t n, sexp str, sexp b) {
int base; int base;
sexp_gc_var1(in); sexp_gc_var2(in, res);
sexp_assert_type(ctx, sexp_stringp, SEXP_STRING, str); sexp_assert_type(ctx, sexp_stringp, SEXP_STRING, str);
sexp_assert_type(ctx, sexp_fixnump, SEXP_FIXNUM, b); sexp_assert_type(ctx, sexp_fixnump, SEXP_FIXNUM, b);
if (((base=sexp_unbox_fixnum(b)) < 2) || (base > 36)) if (((base=sexp_unbox_fixnum(b)) < 2) || (base > 36))
@ -3759,20 +3759,22 @@ sexp sexp_string_to_number_op (sexp ctx, sexp self, sexp_sint_t n, sexp str, sex
if (sexp_string_data(str)[0]=='\0' if (sexp_string_data(str)[0]=='\0'
|| (sexp_string_data(str)[1]=='\0' && !sexp_isxdigit((unsigned char)(sexp_string_data(str)[0])))) || (sexp_string_data(str)[1]=='\0' && !sexp_isxdigit((unsigned char)(sexp_string_data(str)[0]))))
return SEXP_FALSE; return SEXP_FALSE;
sexp_gc_preserve1(ctx, in); sexp_gc_preserve2(ctx, in, res);
in = sexp_open_input_string(ctx, str); in = sexp_open_input_string(ctx, str);
if (sexp_string_data(str)[0] == '+') { if (sexp_string_data(str)[0] == '+') {
if (sexp_isdigit((unsigned char)(sexp_string_data(str)[1])) if (sexp_isdigit((unsigned char)(sexp_string_data(str)[1]))
|| sexp_string_data(str)[1] == '.' || sexp_string_data(str)[1] == '#') || sexp_string_data(str)[1] == '.' || sexp_string_data(str)[1] == '#')
sexp_read_char(ctx, in); sexp_read_char(ctx, in);
} }
in = ((sexp_string_data(str)[0] == '#' && res = ((sexp_string_data(str)[0] == '#' &&
sexp_tolower((unsigned char)sexp_string_data(str)[1]) != 'e' && sexp_tolower((unsigned char)sexp_string_data(str)[1]) != 'e' &&
sexp_tolower((unsigned char)sexp_string_data(str)[1]) != 'i') sexp_tolower((unsigned char)sexp_string_data(str)[1]) != 'i')
|| base == 10 ? sexp_read(ctx, in) : || base == 10 ? sexp_read(ctx, in) :
sexp_read_number(ctx, in, base, 0)); sexp_read_number(ctx, in, base, 0));
sexp_gc_release1(ctx); if (!sexp_numberp(res) || sexp_peek_char(ctx, in) != EOF)
return sexp_numberp(in) ? in : SEXP_FALSE; res = SEXP_FALSE;
sexp_gc_release2(ctx);
return res;
} }
sexp sexp_write_to_string (sexp ctx, sexp obj) { sexp sexp_write_to_string (sexp ctx, sexp obj) {

1
tests/r7rs-tests.scm
View file

@ -1025,6 +1025,7 @@
(test 100 (string->number "100")) (test 100 (string->number "100"))
(test 256 (string->number "100" 16)) (test 256 (string->number "100" 16))
(test 100.0 (string->number "1e2")) (test 100.0 (string->number "1e2"))
(test #f (string->number "1 2"))
(test-end) (test-end)