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

* internal.h (MUL_OVERFLOW_INT_P): New macro.

Browse Source 
* sprintf.c (GETNUM): Don't overflow on signed integer multiplication.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-04-09 21:37:04 +00:00
parent 712c7168bf
commit e699df95d0
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Apr 10 06:32:12 2013 Tanaka Akira <akr@fsij.org>
* internal.h (MUL_OVERFLOW_INT_P): New macro.
* sprintf.c (GETNUM): Don't overflow on signed integer multiplication.
Tue Apr 9 20:38:20 2013 Tanaka Akira <akr@fsij.org> Tue Apr 9 20:38:20 2013 Tanaka Akira <akr@fsij.org>
* internal.h (MUL_OVERFLOW_SIGNED_INTEGER_P): New macro. * internal.h (MUL_OVERFLOW_SIGNED_INTEGER_P): New macro.

1
internal.h
View File

@ -36,6 +36,7 @@ extern "C" {
((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b))) ((b) > 0 ? (min) / (a) < (b) : (max) / (a) > (b)))
#define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX) #define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX)
#define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX) #define MUL_OVERFLOW_LONG_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, LONG_MIN, LONG_MAX)
#define MUL_OVERFLOW_INT_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, INT_MIN, INT_MAX)
struct rb_deprecated_classext_struct { struct rb_deprecated_classext_struct {
char conflict[sizeof(VALUE) * 3]; char conflict[sizeof(VALUE) * 3];

10
sprintf.c
View File

@ -14,6 +14,7 @@
#include "ruby/ruby.h" #include "ruby/ruby.h"
#include "ruby/re.h" #include "ruby/re.h"
#include "ruby/encoding.h" #include "ruby/encoding.h"
#include "internal.h"
#include <math.h> #include <math.h>
#include <stdarg.h> #include <stdarg.h>
@ -128,10 +129,13 @@ sign_bits(int base, const char *p)
#define GETNUM(n, val) \ #define GETNUM(n, val) \
for (; p < end && rb_enc_isdigit(*p, enc); p++) { \ for (; p < end && rb_enc_isdigit(*p, enc); p++) { \
int next_n = 10 * (n) + (*p - '0'); \ int next_n = (n); \
if (next_n / 10 != (n)) {\ if (MUL_OVERFLOW_INT_P(10, next_n)) \
rb_raise(rb_eArgError, #val " too big"); \ rb_raise(rb_eArgError, #val " too big"); \
} \ next_n *= 10; \
if (INT_MAX - (*p - '0') < next_n) \
rb_raise(rb_eArgError, #val " too big"); \
next_n += *p - '0'; \
(n) = next_n; \ (n) = next_n; \
} \ } \
if (p >= end) { \ if (p >= end) { \