From 16d0ad48996eaf76b240cff2d8af02defe29e327 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 6 Mar 2008 06:20:48 +0000 Subject: [PATCH] * sprintf.c (rb_str_format): casting double to long is undefined if the interger part of double is out of the range of long. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ sprintf.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f277ed0719..cf507ee2f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 6 15:16:55 2008 NAKAMURA Usaku + + * sprintf.c (rb_str_format): casting double to long is undefined + if the interger part of double is out of the range of long. + Thu Mar 6 15:11:40 2008 Nobuyoshi Nakada * sprintf.c (rb_str_format): ignore 0 flag for NaN and Inf. diff --git a/sprintf.c b/sprintf.c index f5b3e8474a..795af92373 100644 --- a/sprintf.c +++ b/sprintf.c @@ -540,7 +540,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) bin_retry: switch (TYPE(val)) { case T_FLOAT: - if (FIXABLE((long)RFLOAT_VALUE(val))) { + if (RFLOAT_VALUE(val) <= LONG_MAX && + RFLOAT_VALUE(val) >= LONG_MIN) { val = LONG2FIX((long)RFLOAT_VALUE(val)); goto bin_retry; }