diff options
author | NARUSE, Yui <naruse@airemix.jp> | 2022-02-01 21:41:56 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2022-02-01 21:41:56 +0900 |
commit | 1f17463dec2ab1535096cb56005a840eae4fea5b (patch) | |
tree | 226c9860234034b9687f2fbdd10a22d72dc62136 | |
parent | 1c426ddb25e2ccb169720e4f9894605596fe594d (diff) |
merge revision(s) 6a6227e0168b059c3ed34c9f0ace2e5dc2364221: [Backport #18517]
Shifting zero always results in zero [Bug #18517]
---
numeric.c | 2 ++
1 file changed, 2 insertions(+)
-rw-r--r-- | numeric.c | 2 | ||||
-rw-r--r-- | version.h | 6 |
2 files changed, 5 insertions, 3 deletions
@@ -5073,6 +5073,7 @@ rb_fix_lshift(VALUE x, VALUE y) long val, width; val = NUM2LONG(x); + if (!val) return (rb_to_int(y), INT2FIX(0)); if (!FIXNUM_P(y)) return rb_big_lshift(rb_int2big(val), y); width = FIX2LONG(y); @@ -5127,6 +5128,7 @@ rb_fix_rshift(VALUE x, VALUE y) long i, val; val = FIX2LONG(x); + if (!val) return (rb_to_int(y), INT2FIX(0)); if (!FIXNUM_P(y)) return rb_big_rshift(rb_int2big(val), y); i = FIX2LONG(y); @@ -11,11 +11,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 10 +#define RUBY_PATCHLEVEL 11 #define RUBY_RELEASE_YEAR 2022 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 1 #include "ruby/version.h" |