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

mrb_str_len_to_inum(): fixed a bug with underscores in digits; fix #3049

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-12-16 14:47:49 +09:00
parent 80c1c60762
commit d18c55fca7
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.c
+7 -12
View File
@@ -2145,29 +2145,24 @@ mrb_str_len_to_inum(mrb_state *mrb, const char *str, size_t len, int base, int b
}
}
}
c = *p;
if (badcheck && c == '\0') {
goto bad;
}
c = conv_digit(c);
if (c < 0 || c >= base) {
if (p == pend) {
if (badcheck) goto bad;
return mrb_fixnum_value(0);
}
for ( ;p<pend;p++) {
if (*p == '_') {
if (p+1<pend && p[1] == '_') {
p++;
if (p==pend) {
if (badcheck) goto bad;
continue;
}
p++;
if (badcheck && p<pend)
goto bad;
if (*p == '_') {
if (badcheck) goto bad;
break;
}
}
if (badcheck && *p == '\0') {
goto nullbyte;
break;
}
c = conv_digit(*p);
if (c < 0 || c >= base) {