summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-07 09:07:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-07 09:07:57 +0000
commitf4d13801b620f55e886f3108f6f37ef386c4669d (patch)
treedee4fcfa5cf85dd9e9bd462a0569118fc114bf67 /string.c
parentd19d629eaa8baa50208a4ef872a5133f5d5b6ece (diff)
string.c: fix integer overflow
* string.c (str_byte_substr): fix another integer overflow which can happen only when SHARABLE_MIDDLE_SUBSTRING is enabled. [ruby-core:79951] [Bug #13289] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/string.c b/string.c
index 4968e86d74..43b8b4e007 100644
--- a/string.c
+++ b/string.c
@@ -5254,7 +5254,7 @@ str_byte_substr(VALUE str, long beg, long len, int empty)
beg += n;
if (beg < 0) return Qnil;
}
- if (beg + len > n)
+ if (len > n - beg)
len = n - beg;
if (len <= 0) {
if (!empty) return Qnil;