admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

ary_expand_capa(): refine conditions to avoid infinite loop; ref #3353

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2016-12-31 23:22:17 +09:00
parent 9d84f0d47b
commit cfdd1e3cc6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+7 -4
View File
@@ -170,6 +170,7 @@ ary_expand_capa(mrb_state *mrb, struct RArray *a, size_t len)
size_t capa = a->aux.capa;
if (len > ARY_MAX_SIZE) {
size_error:
mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
}
@@ -177,13 +178,15 @@ ary_expand_capa(mrb_state *mrb, struct RArray *a, size_t len)
capa = ARY_DEFAULT_LEN;
}
while (capa < len) {
capa *= 2;
if (capa > ARY_MAX_SIZE) {
capa = ARY_MAX_SIZE;
if (capa <= ARY_MAX_SIZE / 2) {
capa *= 2;
}
else {
goto size_error;
}
}
if (capa < len || capa > MRB_INT_MAX) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
goto size_error;
}
if (capa > (size_t)a->aux.capa) {