1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sprintf.c (rb_str_format): integer overflow check added.

Browse Source 
* sprintf.c (GETASTER): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2005-12-07 06:36:38 +00:00
parent dfcbc92614
commit e122cca179
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Dec 7 15:31:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_str_format): integer overflow check added.
* sprintf.c (GETASTER): ditto.
Wed Dec 7 01:02:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Wed Dec 7 01:02:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/README.macosx-aqua: [new document] tips to avoid the known * ext/tk/README.macosx-aqua: [new document] tips to avoid the known
@ -21,8 +27,8 @@ Wed Dec 7 01:02:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
Tue Dec 6 16:48:40 2005 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Dec 6 16:48:40 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (ruby_xmalloc2): change check for integer overflow. * gc.c (ruby_xmalloc2): change check condition for integer
[ruby-dev:27399] overflow. [ruby-dev:27399]
* gc.c (ruby_xrealloc2): ditto. * gc.c (ruby_xrealloc2): ditto.

9
sprintf.c
View File

@ -116,6 +116,10 @@ sign_bits(int base, const char *p)
t = p++; \ t = p++; \
n = 0; \ n = 0; \
for (; p < end && ISDIGIT(*p); p++) { \ for (; p < end && ISDIGIT(*p); p++) { \
int times10 = n*10; \
if (times10 / 10 != n) {\
rb_raise(rb_eArgError, #val " too big"); \
} \
n = 10 * n + (*p - '0'); \ n = 10 * n + (*p - '0'); \
} \ } \
if (p >= end) { \ if (p >= end) { \
@ -316,6 +320,10 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
case '5': case '6': case '7': case '8': case '9': case '5': case '6': case '7': case '8': case '9':
n = 0; n = 0;
for (; p < end && ISDIGIT(*p); p++) { for (; p < end && ISDIGIT(*p); p++) {
int times10 = n*10;
if (times10 / 10 != n) {
rb_raise(rb_eArgError, "width too big");
}
n = 10 * n + (*p - '0'); n = 10 * n + (*p - '0');
} }
if (p >= end) { if (p >= end) {
@ -337,7 +345,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
if (flags & FWIDTH) { if (flags & FWIDTH) {
rb_raise(rb_eArgError, "width given twice"); rb_raise(rb_eArgError, "width given twice");
} }
flags |= FWIDTH; flags |= FWIDTH;
GETASTER(width); GETASTER(width);
if (width < 0) { if (width < 0) {