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

string.c: check in the order

Browse Source 
* string.c (rb_str_aref_m, rb_str_byteslice): check arguments in
  the left-to-right order.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-05-30 05:41:02 +00:00
parent 55a39399ff
commit e3e8cae9be
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
string.c
View File

@ -4121,7 +4121,11 @@ rb_str_aref_m(int argc, VALUE *argv, VALUE str)
if (RB_TYPE_P(argv[0], T_REGEXP)) { if (RB_TYPE_P(argv[0], T_REGEXP)) {
return rb_str_subpat(str, argv[0], argv[1]); return rb_str_subpat(str, argv[0], argv[1]);
} }
return rb_str_substr(str, NUM2LONG(argv[0]), NUM2LONG(argv[1])); {
long beg = NUM2LONG(argv[0]);
long len = NUM2LONG(argv[1]);
return rb_str_substr(str, beg, len);
}
} }
rb_check_arity(argc, 1, 2); rb_check_arity(argc, 1, 2);
return rb_str_aref(str, argv[0]); return rb_str_aref(str, argv[0]);
@ -5135,7 +5139,9 @@ static VALUE
rb_str_byteslice(int argc, VALUE *argv, VALUE str) rb_str_byteslice(int argc, VALUE *argv, VALUE str)
{ {
if (argc == 2) { if (argc == 2) {
return str_byte_substr(str, NUM2LONG(argv[0]), NUM2LONG(argv[1])); long beg = NUM2LONG(argv[0]);
long end = NUM2LONG(argv[1]);
return str_byte_substr(str, beg, end);
} }
rb_check_arity(argc, 1, 2); rb_check_arity(argc, 1, 2);
return str_byte_aref(str, argv[0]); return str_byte_aref(str, argv[0]);