From f70159b0d3c93674b8ea9fdb9a8ef3af97b6eec9 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 30 May 2016 05:41:02 +0000
Subject: string.c: check in the order

* 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
---
 string.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/string.c b/string.c
index 80b668d52d..e4eded1a08 100644
--- a/string.c
+++ b/string.c
@@ -4121,7 +4121,11 @@ rb_str_aref_m(int argc, VALUE *argv, VALUE str)
 	if (RB_TYPE_P(argv[0], T_REGEXP)) {
 	    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);
     return rb_str_aref(str, argv[0]);
@@ -5135,7 +5139,9 @@ static VALUE
 rb_str_byteslice(int argc, VALUE *argv, VALUE str)
 {
     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);
     return str_byte_aref(str, argv[0]);
-- 
cgit v1.2.3