admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4426 from shuujii/use-mrb_string_value_cstr-in-mrb_str_to_dbl

Browse Source 
Use `mrb_string_value_cstr` in `mrb_str_to_dbl`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-05-08 21:32:11 +09:00
committed by GitHub
parent f405d35dac 1975dedb21
commit ecc6eb81b5
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-kernel-ext/test/kernel.rb
+2
View File
@@ -65,6 +65,8 @@ assert('Kernel#Float') do
assert_equal(123.456, Float(123.456))
assert_equal(123.456, Float("123.456"))
assert_raise(TypeError) { Float(nil) }
assert_raise(ArgumentError) { Float("1.5a") }
assert_raise(ArgumentError) { Float("1.5\0") }
end
assert('Kernel#String') do
src/string.c
+1 -16
View File
@@ -2281,22 +2281,7 @@ bad:
MRB_API double
mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck)
{
char *s;
mrb_int len;
mrb_to_str(mrb, str);
s = RSTRING_PTR(str);
len = RSTRING_LEN(str);
if (s) {
if (badcheck && memchr(s, '\0', len)) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "string for Float contains null byte");
}
if (s[len]) { /* no sentinel somehow */
struct RString *temp_str = str_new(mrb, s, len);
s = RSTR_PTR(temp_str);
}
}
return mrb_cstr_to_dbl(mrb, s, badcheck);
return mrb_cstr_to_dbl(mrb, mrb_string_value_cstr(mrb, &str), badcheck);
}
/* 15.2.10.5.39 */