diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/date/date_core.c | 17 |
2 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Tue Dec 8 09:03:19 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/date/date_core.c (d_lite_lshift): should check the argument + before negation. + Tue Dec 8 08:56:16 2015 Eric Wong <e@80x24.org> * insns.def (opt_case_dispatch): check Float#=== redefinition diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 4538c8b270..64f19e4d54 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -1978,6 +1978,13 @@ k_rational_p(VALUE x) return f_kind_of_p(x, rb_cRational); } +static inline void +expect_numeric(VALUE x) +{ + if (!k_numeric_p(x)) + rb_raise(rb_eTypeError, "expected numeric"); +} + #ifndef NDEBUG static void civil_to_jd(VALUE y, int m, int d, double sg, @@ -2351,8 +2358,7 @@ offset_to_sec(VALUE vof, int *rof) return 1; } default: - if (!k_numeric_p(vof)) - rb_raise(rb_eTypeError, "expected numeric"); + expect_numeric(vof); vof = f_to_r(vof); #ifdef CANONICALIZATION_FOR_MATHN if (!k_rational_p(vof)) @@ -5717,8 +5723,7 @@ d_lite_plus(VALUE self, VALUE other) } break; default: - if (!k_numeric_p(other)) - rb_raise(rb_eTypeError, "expected numeric"); + expect_numeric(other); other = f_to_r(other); #ifdef CANONICALIZATION_FOR_MATHN if (!k_rational_p(other)) @@ -5902,8 +5907,7 @@ d_lite_minus(VALUE self, VALUE other) case T_FLOAT: return d_lite_plus(self, DBL2NUM(-RFLOAT_VALUE(other))); default: - if (!k_numeric_p(other)) - rb_raise(rb_eTypeError, "expected numeric"); + expect_numeric(other); /* fall through */ case T_BIGNUM: case T_RATIONAL: @@ -6022,6 +6026,7 @@ d_lite_rshift(VALUE self, VALUE other) static VALUE d_lite_lshift(VALUE self, VALUE other) { + expect_numeric(other); return d_lite_rshift(self, f_negate(other)); } |