diff options
| author | Ryan Scott <[email protected]> | 2013-07-21 18:18:35 +1000 |
|---|---|---|
| committer | Ryan Scott <[email protected]> | 2013-07-21 18:18:35 +1000 |
| commit | fd9cc9938cb5998c2388431c396afe238462c9e2 (patch) | |
| tree | 0bf823a60f3922b3c92c94e2f79c0bbb31084e06 /src/array.c | |
| parent | 43c0f43f1355c1d421b36f5ede7bb5c3aa6b6dd8 (diff) | |
| parent | bc843ed9272d9733cafea7df130134264d15d6d9 (diff) | |
| download | mruby-fd9cc9938cb5998c2388431c396afe238462c9e2.tar.gz mruby-fd9cc9938cb5998c2388431c396afe238462c9e2.zip | |
Merge branch 'master' into attr-perf-fix
Diffstat (limited to 'src/array.c')
| -rw-r--r-- | src/array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/array.c b/src/array.c index ed087515a..b5bbdf0fa 100644 --- a/src/array.c +++ b/src/array.c @@ -19,7 +19,7 @@ #define ARY_DEFAULT_LEN 4 #define ARY_SHRINK_RATIO 5 /* must be larger than 2 */ #define ARY_C_MAX_SIZE (SIZE_MAX / sizeof(mrb_value)) -#define ARY_MAX_SIZE ((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? (mrb_int)ARY_C_MAX_SIZE : MRB_INT_MAX) +#define ARY_MAX_SIZE ((ARY_C_MAX_SIZE < (size_t)MRB_INT_MAX) ? (mrb_int)ARY_C_MAX_SIZE : MRB_INT_MAX-1) static inline mrb_value ary_elt(mrb_value ary, mrb_int offset) @@ -40,7 +40,7 @@ ary_new_capa(mrb_state *mrb, mrb_int capa) if (capa > ARY_MAX_SIZE) { mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big"); } - blen = capa * sizeof(mrb_value) ; + blen = capa * sizeof(mrb_value); if (blen < capa) { mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big"); } |