Use size_t to avoid integer overflow in mrb_ary_splice(); fix #3413

This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-01-24 11:36:27 +09:00
parent 28cf7a549d
commit 72bff2932b
+5 -2
View File
@@ -591,6 +591,7 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
struct RArray *a = mrb_ary_ptr(ary);
const mrb_value *argv;
mrb_int argc;
size_t tail;
ary_modify(mrb, a);
@@ -604,7 +605,8 @@ 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) {
tail = head + len;
if (a->len < len || (size_t)a->len < tail) {
len = a->len - head;
}
@@ -647,7 +649,8 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
}
if (len != argc) {
value_move(a->ptr + head + argc, a->ptr + head + len, a->len - (head + len));
tail = head + len;
value_move(a->ptr + head + argc, a->ptr + tail, a->len - tail);
a->len = alen;
}
if (argc > 0) {