summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-12-01 11:13:32 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-12-01 11:13:32 +0900
commitdbb8cf637e8311ffa3c35829d4c007b1434fe0c6 (patch)
tree9c3d34353bfef006f52952fcfa5d1e0152baf58d
parent9f2fca6ebeacaf35a2f6e17c30c9024c730c54d7 (diff)
downloadmruby-dbb8cf637e8311ffa3c35829d4c007b1434fe0c6.tar.gz
mruby-dbb8cf637e8311ffa3c35829d4c007b1434fe0c6.zip
mrb_str_to_inum(): should raise error when string contains null byte
-rw-r--r--src/string.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/string.c b/src/string.c
index 510bd4e73..6c1988e92 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2201,6 +2201,9 @@ mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, mrb_bool badcheck)
s = mrb_string_value_ptr(mrb, str);
if (s) {
len = RSTRING_LEN(str);
+ if (badcheck && strlen(s) != len) {
+ mrb_raise(mrb, E_ARGUMENT_ERROR, "string contains null byte");
+ }
if (s[len]) { /* no sentinel somehow */
struct RString *temp_str = str_new(mrb, s, len);
s = RSTR_PTR(temp_str);