summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-09-27 17:17:14 +0900
committerYukihiro Matsumoto <[email protected]>2012-09-27 17:17:14 +0900
commit5adbbe66d86de3959d2e8cb114c8be255459bb0a (patch)
treeabaacc11d209d6a1d23cd4cb3bb35440e3db6a0f /src
parent7171e5aa18a411f78675d1aba7a4dfd00d797e11 (diff)
downloadmruby-5adbbe66d86de3959d2e8cb114c8be255459bb0a.tar.gz
mruby-5adbbe66d86de3959d2e8cb114c8be255459bb0a.zip
should adjust array size
Diffstat (limited to 'src')
-rw-r--r--src/array.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/array.c b/src/array.c
index e55b104da..36f4af9c6 100644
--- a/src/array.c
+++ b/src/array.c
@@ -587,8 +587,7 @@ mrb_value
mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_value rpl)
{
struct RArray *a = mrb_ary_ptr(ary);
- mrb_int tail;
- int size;
+ int tail, size;
mrb_value *argv;
int i, argc;
@@ -600,6 +599,9 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
mrb_raise(mrb, E_INDEX_ERROR, "index is out of array");
}
}
+ if (a->len < len || a->len < head + len) {
+ len = a->len - head;
+ }
tail = head + len;
/* size check */
@@ -614,7 +616,6 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
size = head + argc;
if (tail < a->len) size += a->len - tail;
-
if (size > a->aux.capa)
ary_expand_capa(mrb, a, size);