From 885d929398cf6962f3b0d292cf44105976f6c848 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Fri, 6 Jan 2017 14:53:00 +0900
Subject: Improve capacity enhancing conditions

---
 src/array.c  | 4 ++--
 src/string.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/array.c b/src/array.c
index 54ff26721..420907866 100644
--- a/src/array.c
+++ b/src/array.c
@@ -182,10 +182,10 @@ ary_expand_capa(mrb_state *mrb, struct RArray *a, size_t len)
       capa *= 2;
     }
     else {
-      goto size_error;
+      capa = len;
     }
   }
-  if (capa < len || capa > MRB_INT_MAX) {
+  if (capa < len || capa > ARY_MAX_SIZE) {
     goto size_error;
   }
 
diff --git a/src/string.c b/src/string.c
index 976c34687..b4746545a 100644
--- a/src/string.c
+++ b/src/string.c
@@ -169,7 +169,7 @@ str_buf_cat(mrb_state *mrb, struct RString *s, const char *ptr, size_t len)
         capa *= 2;
       }
       else {
-        goto size_error;
+        capa = total;
       }
     }
     if (capa < total || capa > MRB_INT_MAX) {
-- 
cgit v1.2.3