summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-07-18 19:19:31 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2013-07-18 19:19:31 -0700
commitc5eff2e49a65bfe0670a8ec5838832991da3b0b7 (patch)
tree6570480b33f787438ee6a7a86d54c6a3f3d4af1f /src
parent958d5b763df9cbfbf0173d35ba0ba27934f16394 (diff)
parentb9a32e434ab4e796c75aa98d29c65fb89024f3b0 (diff)
downloadmruby-c5eff2e49a65bfe0670a8ec5838832991da3b0b7.tar.gz
mruby-c5eff2e49a65bfe0670a8ec5838832991da3b0b7.zip
Merge pull request #1391 from carsonmcdonald/fixfallbackarraysize
Changed use of MRB_INT_MAX to MRB_INT_MAX-1
Diffstat (limited to 'src')
-rw-r--r--src/array.c4
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");
}