aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-10 12:01:45 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-10 12:01:45 +0000
commitd04f1089528f395caf7398a94af947f7e32128e2 (patch)
tree1bb0336a657a130d7f54101092cf7dc9388ac3bf
parentf6a9c859bec2801a99c26a09c8845c54401a62be (diff)
downloadruby-d04f1089528f395caf7398a94af947f7e32128e2.tar.gz
* array.c (rb_ary_slice_bang): should return nil if position out
of range. a patch from Akinori MUSHA <knu AT iDaemons.org>. [ruby-dev:32518] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--array.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2487728834..153543cd3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 10 21:00:30 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * array.c (rb_ary_slice_bang): should return nil if position out
+ of range. a patch from Akinori MUSHA <knu AT iDaemons.org>.
+ [ruby-dev:32518]
+
Mon Dec 10 19:02:52 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_reg_match): should calculate offset by converted
diff --git a/array.c b/array.c
index 4eaf0c7ddc..30caf7b5da 100644
--- a/array.c
+++ b/array.c
@@ -1888,6 +1888,7 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
delete_pos_len:
if (pos < 0) {
pos = RARRAY_LEN(ary) + pos;
+ if (pos < 0) return Qnil;
}
arg2 = rb_ary_subseq(ary, pos, len);
rb_ary_splice(ary, pos, len, Qundef); /* Qnil/rb_ary_new2(0) */