diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-06-19 09:44:26 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-06-19 09:44:26 +0900 |
| commit | 28678997e40869f5591eae60edd9757334426ffb (patch) | |
| tree | 76f6c6d8993e2b21cef090f1dcd030154bd1e018 /string.c | |
| parent | d009e321a08d2ca401fceefa638e7e50872f5f54 (diff) | |
| download | ruby-28678997e40869f5591eae60edd9757334426ffb.tar.gz | |
Preserve the string content at self-copying
* string.c (rb_str_init): preserve the embedded content when
self-copying with a capacity. [Bug #15937]
Diffstat (limited to 'string.c')
| -rw-r--r-- | string.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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, |