From 28678997e40869f5591eae60edd9757334426ffb Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 19 Jun 2019 09:44:26 +0900 Subject: Preserve the string content at self-copying * string.c (rb_str_init): preserve the embedded content when self-copying with a capacity. [Bug #15937] --- string.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index fdb7e4003c..e402a5a7aa 100644 --- a/string.c +++ b/string.c @@ -1331,6 +1331,7 @@ str_new_empty(VALUE str) } #define STR_BUF_MIN_SIZE 127 +STATIC_ASSERT(STR_BUF_MIN_SIZE, STR_BUF_MIN_SIZE > RSTRING_EMBED_LEN_MAX); VALUE rb_str_buf_new(long capa) @@ -1611,7 +1612,9 @@ rb_str_init(int argc, VALUE *argv, VALUE str) } str_modifiable(str); if (STR_EMBED_P(str)) { /* make noembed always */ - RSTRING(str)->as.heap.ptr = ALLOC_N(char, (size_t)capa + termlen); + char *new_ptr = ALLOC_N(char, (size_t)capa + termlen); + memcpy(new_ptr, RSTRING(str)->as.ary, RSTRING_EMBED_LEN_MAX + 1); + RSTRING(str)->as.heap.ptr = new_ptr; } else if (STR_HEAP_SIZE(str) != (size_t)capa + termlen) { SIZED_REALLOC_N(RSTRING(str)->as.heap.ptr, char, -- cgit v1.2.3