diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-07 08:42:42 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-07 08:42:42 +0000 |
| commit | bef0d03b4796b78cc2b1b28c680d528d8e9cda21 (patch) | |
| tree | ac5b8caab42f5329cb1998fefa562ce556791034 | |
| parent | 46f0dbeacacd5e801fd3d83006889d83b2f3030f (diff) | |
| download | ruby-bef0d03b4796b78cc2b1b28c680d528d8e9cda21.tar.gz ruby-bef0d03b4796b78cc2b1b28c680d528d8e9cda21.tar.xz ruby-bef0d03b4796b78cc2b1b28c680d528d8e9cda21.zip | |
* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
* sprintf.c (rb_str_format): integer overflow check added.
* sprintf.c (GETASTER): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sprintf.c | 8 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Wed Dec 7 17:10:27 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + + * sprintf.c (rb_f_sprintf): [ruby-dev:27967] + Wed Dec 7 15:31:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * sprintf.c (rb_str_format): integer overflow check added. @@ -113,10 +113,11 @@ sign_bits(base, p) t = p++; \ n = 0; \ for (; p < end && ISDIGIT(*p); p++) { \ - if ((n*10) / 10 != n) { \ + int next_n = 10 * n + (*p - '0'); \ + if (next_n / 10 != n) {\ rb_raise(rb_eArgError, #val " too big"); \ } \ - n = 10 * n + (*p - '0'); \ + n = next_n; \ } \ if (p >= end) { \ rb_raise(rb_eArgError, "malformed format string - %%*[0-9]"); \ @@ -312,7 +313,8 @@ rb_f_sprintf(argc, argv) case '5': case '6': case '7': case '8': case '9': n = 0; for (; p < end && ISDIGIT(*p); p++) { - if ((n*10) / 10 != n) { + int next_n = 10 * n + (*p - '0'); + if (next_n / 10 != n) { rb_raise(rb_eArgError, "width too big"); } n = 10 * n + (*p - '0'); |