diff options
Diffstat (limited to 'string.c')
| -rw-r--r-- | string.c | 27 |
1 files changed, 18 insertions, 9 deletions
@@ -1250,27 +1250,36 @@ rb_str_dup(VALUE str) VALUE rb_str_resurrect(VALUE str) { + enum {embed_size = RSTRING_EMBED_LEN_MAX + 1}; + const VALUE flag_mask = + RSTRING_NOEMBED | RSTRING_EMBED_LEN_MASK | + ENC_CODERANGE_MASK | ENCODING_MASK | + FL_TAINT | FL_FREEZE + ; + VALUE flags = FL_TEST_RAW(str, flag_mask); VALUE dup; - VALUE flags = FL_TEST_RAW(str, - RSTRING_NOEMBED | - RSTRING_EMBED_LEN_MASK | - ENC_CODERANGE_MASK | - ENCODING_MASK | - FL_TAINT | FL_FREEZE); if (RUBY_DTRACE_STRING_CREATE_ENABLED()) { RUBY_DTRACE_STRING_CREATE(RSTRING_LEN(str), rb_sourcefile(), rb_sourceline()); } dup = str_alloc(rb_cString); - MEMCPY(RSTRING(dup)->as.ary, RSTRING(str)->as.ary, VALUE, 3); + MEMCPY(RSTRING(dup)->as.ary, RSTRING(str)->as.ary, + char, embed_size); if (flags & STR_NOEMBED) { if (UNLIKELY(!(flags & FL_FREEZE))) { str = str_new_frozen(rb_cString, str); FL_SET_RAW(str, flags & FL_TAINT); + flags = FL_TEST_RAW(str, flag_mask); + } + if (flags & STR_NOEMBED) { + RB_OBJ_WRITE(dup, &RSTRING(dup)->as.heap.aux.shared, str); + flags |= STR_SHARED; + } + else { + MEMCPY(RSTRING(dup)->as.ary, RSTRING(str)->as.ary, + char, embed_size); } - RB_OBJ_WRITE(dup, &RSTRING(dup)->as.heap.aux.shared, str); - flags |= STR_SHARED; } FL_SET_RAW(dup, flags & ~FL_FREEZE); return dup; |