summaryrefslogtreecommitdiffhomepage
path: root/src/range.c
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2012-11-14 14:42:36 +0900
committerYukihiro Matz Matsumoto <[email protected]>2012-11-14 14:42:36 +0900
commit73dda8cb41b0c1864db376dd986694de0e296293 (patch)
treea914c88d070c75c66dce72f639d11745614b4da2 /src/range.c
parent3eeef306184f202c106d56a13022afc54dad98cb (diff)
parent9849501686fee78dd58b27b1c6519707671d6484 (diff)
downloadmruby-73dda8cb41b0c1864db376dd986694de0e296293.tar.gz
mruby-73dda8cb41b0c1864db376dd986694de0e296293.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/range.c')
-rw-r--r--src/range.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/range.c b/src/range.c
index 6fe7964fe..085d5b1c0 100644
--- a/src/range.c
+++ b/src/range.c
@@ -286,7 +286,7 @@ mrb_range_beg_len(mrb_state *mrb, mrb_value range, mrb_int *begp, mrb_int *lenp,
if (end > len) end = len;
}
if (end < 0) end += len;
- if (!r->excl) end++; /* include end point */
+ if (!r->excl && end < len) end++; /* include end point */
len = end - beg;
if (len < 0) len = 0;