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

Merge pull request #6656 from dearblue/combination_init.2

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-10-29 11:01:29 +09:00
committed by GitHub
parent cbab9ca613 c28223ac5b
commit 2c47e84cab
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-array-ext/src/array.c
+6 -4
View File
@@ -1309,6 +1309,11 @@ ary_combination_init(mrb_state *mrb, mrb_value self)
mrb_bool permutation;
mrb_get_args(mrb, "ib", &n, &permutation);
#if MRB_INT_MAX > SIZE_MAX
if (n > SIZE_MAX) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "number too large");
}
#endif
struct RData *d;
struct mrb_combination_state *state;
@@ -1321,10 +1326,7 @@ ary_combination_init(mrb_state *mrb, mrb_value self)
state->finished = (n <= 0 && n != 0);
if (n > 0) {
state->indices = (mrb_int*)mrb_malloc(mrb, sizeof(mrb_int) * n);
for (mrb_int i = 0; i < n; i++) {
state->indices[i] = 0;
}
state->indices = (mrb_int*)mrb_calloc(mrb, n, sizeof(mrb_int));
}
return mrb_obj_value(d);
src/gc.c
+5 -3
View File
@@ -243,15 +243,17 @@ mrb_calloc(mrb_state *mrb, size_t nelem, size_t len)
{
void *p;
if (nelem > 0 && len > 0 &&
nelem <= SIZE_MAX / len) {
if (nelem == 0 || len == 0) {
p = NULL;
}
else if (nelem <= SIZE_MAX / len) {
size_t size = nelem * len;
p = mrb_malloc(mrb, size);
memset(p, 0, size);
}
else {
p = NULL;
mrb_raise(mrb, E_ARGUMENT_ERROR, "memory allocation overflow");
}
return p;