Make rb_str_embed_size aware of termlen

1 files changed, 13 insertions, 11 deletions

diff --git a/string.c b/string.c
index 2a250cc69d..8b18ad9770 100644
--- a/string.c
+++ b/string.c
@@ -240,9 +240,9 @@ rb_str_reembeddable_p(VALUE str)
 }
 
 static inline size_t
-rb_str_embed_size(long capa)
+rb_str_embed_size(long capa, long termlen)
 {
-    size_t size = offsetof(struct RString, as.embed.ary) + capa;
+    size_t size = offsetof(struct RString, as.embed.ary) + capa + termlen;
     if (size < sizeof(struct RString)) size = sizeof(struct RString);
     return size;
 }
@@ -252,28 +252,30 @@ rb_str_size_as_embedded(VALUE str)
 {
     size_t real_size;
     if (STR_EMBED_P(str)) {
-        real_size = rb_str_embed_size(RSTRING(str)->len) + TERM_LEN(str);
+        size_t capa = RSTRING(str)->len;
+        if (FL_TEST_RAW(str, STR_PRECOMPUTED_HASH)) capa += sizeof(st_index_t);
+
+        real_size = rb_str_embed_size(capa, TERM_LEN(str));
     }
     /* if the string is not currently embedded, but it can be embedded, how
      * much space would it require */
     else if (rb_str_reembeddable_p(str)) {
-        real_size = rb_str_embed_size(RSTRING(str)->as.heap.aux.capa) + TERM_LEN(str);
+        size_t capa = RSTRING(str)->as.heap.aux.capa;
+        if (FL_TEST_RAW(str, STR_PRECOMPUTED_HASH)) capa += sizeof(st_index_t);
+
+        real_size = rb_str_embed_size(capa, TERM_LEN(str));
     }
     else {
         real_size = sizeof(struct RString);
     }
 
-    if (FL_TEST_RAW(str, STR_PRECOMPUTED_HASH)) {
-        real_size += sizeof(st_index_t);
-    }
-
     return real_size;
 }
 
 static inline bool
 STR_EMBEDDABLE_P(long len, long termlen)
 {
-    return rb_gc_size_allocatable_p(rb_str_embed_size(len + termlen));
+    return rb_gc_size_allocatable_p(rb_str_embed_size(len, termlen));
 }
 
 static VALUE str_replace_shared_without_enc(VALUE str2, VALUE str);
@@ -1006,7 +1008,7 @@ must_not_null(const char *ptr)
 static inline VALUE
 str_alloc_embed(VALUE klass, size_t capa)
 {
-    size_t size = rb_str_embed_size(capa);
+    size_t size = rb_str_embed_size(capa, 0);
     RUBY_ASSERT(size > 0);
     RUBY_ASSERT(rb_gc_size_allocatable_p(size));
 
@@ -1883,7 +1885,7 @@ str_replace(VALUE str, VALUE str2)
 static inline VALUE
 ec_str_alloc_embed(struct rb_execution_context_struct *ec, VALUE klass, size_t capa)
 {
-    size_t size = rb_str_embed_size(capa);
+    size_t size = rb_str_embed_size(capa, 0);
     RUBY_ASSERT(size > 0);
     RUBY_ASSERT(rb_gc_size_allocatable_p(size));