summaryrefslogtreecommitdiffhomepage
path: root/src/array.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2016-11-30 03:00:43 +0900
committerGitHub <[email protected]>2016-11-30 03:00:43 +0900
commit27d166d4e2b09796408e2e9c2a493ddc4f6a3817 (patch)
tree0821d3684703be18a5a4006181e379b66d7976c5 /src/array.c
parent66f64d4ee8a439794a15981946d271ef602fbfe7 (diff)
parentb633aa9ad466277cf583f60b8e424e516362f0bf (diff)
downloadmruby-27d166d4e2b09796408e2e9c2a493ddc4f6a3817.tar.gz
mruby-27d166d4e2b09796408e2e9c2a493ddc4f6a3817.zip
Merge pull request #3304 from clayton-shopify/fix-array-size
Use size_t to calculate bytes needed for array.
Diffstat (limited to 'src/array.c')
-rw-r--r--src/array.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/array.c b/src/array.c
index ed83bd446..df037a121 100644
--- a/src/array.c
+++ b/src/array.c
@@ -20,15 +20,12 @@ static struct RArray*
ary_new_capa(mrb_state *mrb, mrb_int capa)
{
struct RArray *a;
- mrb_int blen;
+ size_t blen;
if (capa > ARY_MAX_SIZE) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
}
blen = capa * sizeof(mrb_value);
- if (blen < capa) {
- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
- }
a = (struct RArray*)mrb_obj_alloc(mrb, MRB_TT_ARRAY, mrb->array_class);
a->ptr = (mrb_value *)mrb_malloc(mrb, blen);