diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 20:03:19 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 20:03:19 +0000 |
commit | 708380d5988ed73a16cb3076998a1f29d099eb23 (patch) | |
tree | 70eb4e1f90412ab8767fc861f0ad197bb7d0f0c2 | |
parent | db9f4b559d0bbc1d5317c03ad31070ad607cf5ca (diff) |
* bignum.c (rb_cstr_to_inum): check leading non-digits.
[ruby-core:11691]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | bignum.c | 31 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 22 insertions, 16 deletions
@@ -1,3 +1,8 @@ +Thu Aug 16 05:02:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * bignum.c (rb_cstr_to_inum): check leading non-digits. + [ruby-core:11691] + Thu Aug 16 05:00:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * numeric.c (fix_pow): 0**2 should not raise floating point @@ -331,6 +331,13 @@ rb_cstr_to_inum(str, base, badcheck) VALUE z; BDIGIT *zds; +#define conv_digit(c) \ + (!ISASCII(c) ? -1 : \ + isdigit(c) ? ((c) - '0') : \ + islower(c) ? ((c) - 'a' + 10) : \ + isupper(c) ? ((c) - 'A' + 10) : \ + -1) + if (!str) { if (badcheck) goto bad; return INT2FIX(0); @@ -423,7 +430,13 @@ rb_cstr_to_inum(str, base, badcheck) } if (*str == '0') { /* squeeze preceeding 0s */ while (*++str == '0'); - --str; + if (!*str) --str; + } + c = *str; + c = conv_digit(c); + if (c < 0 || c >= base) { + if (badcheck) goto bad; + return INT2FIX(0); } len *= strlen(str)*sizeof(char); @@ -457,7 +470,7 @@ rb_cstr_to_inum(str, base, badcheck) z = bignew(len, sign); zds = BDIGITS(z); for (i=len;i--;) zds[i]=0; - while (c = *str++) { + while ((c = *str++) != 0) { if (c == '_') { if (badcheck) { if (nondigit) goto bad; @@ -465,19 +478,7 @@ rb_cstr_to_inum(str, base, badcheck) } continue; } - else if (!ISASCII(c)) { - break; - } - else if (isdigit(c)) { - c -= '0'; - } - else if (islower(c)) { - c -= 'a' - 10; - } - else if (isupper(c)) { - c -= 'A' - 10; - } - else { + else if ((c = conv_digit(c)) < 0) { break; } if (c >= base) break; @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 71 +#define RUBY_PATCHLEVEL 72 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |