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

string.c: negation of LONG_MIN

Browse Source 
* string.c (rb_str_update): do not use negation of LONG_MIN, which
  is negative too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-03-07 09:13:41 +00:00
parent f4d13801b6
commit d69d98f61a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
string.c
View File

@ -4435,12 +4435,14 @@ rb_str_update(VALUE str, long beg, long len, VALUE val)
rb_raise(rb_eIndexError, "index %ld out of string", beg); rb_raise(rb_eIndexError, "index %ld out of string", beg);
} }
if (beg < 0) { if (beg < 0) {
if (-beg > slen) { if (beg + slen < 0) {
goto out_of_range; goto out_of_range;
} }
beg += slen; beg += slen;
} }
if (slen < len || slen < beg + len) { assert(beg >= 0);
assert(beg <= slen);
if (len > slen - beg) {
len = slen - beg; len = slen - beg;
} }
str_modify_keep_cr(str); str_modify_keep_cr(str);

2
test/ruby/test_string.rb
View File

@ -202,6 +202,8 @@ CODE
assert_equal("fobar", s) assert_equal("fobar", s)
assert_raise(ArgumentError) { "foo"[1, 2, 3] = "" } assert_raise(ArgumentError) { "foo"[1, 2, 3] = "" }
assert_raise(IndexError) {"foo"[RbConfig::Limits["LONG_MIN"]] = "l"}
end end
def test_CMP # '<=>' def test_CMP # '<=>'