diff options
| -rw-r--r-- | string.c | 4 | ||||
| -rw-r--r-- | test/-ext-/string/test_cstr.rb | 11 |
2 files changed, 13 insertions, 2 deletions
@@ -1589,11 +1589,11 @@ str_make_independent_expand(VALUE str, long expand) if (len > capa) len = capa; - if (capa <= RSTRING_EMBED_LEN_MAX && !STR_EMBED_P(str)) { + if (capa + termlen - 1 <= RSTRING_EMBED_LEN_MAX && !STR_EMBED_P(str)) { ptr = RSTRING(str)->as.heap.ptr; STR_SET_EMBED(str); memcpy(RSTRING(str)->as.ary, ptr, len); - RSTRING(str)->as.ary[len] = '\0'; /* Ensure string is terminated */ + TERM_FILL(RSTRING(str)->as.ary + len, termlen); STR_SET_EMBED_LEN(str, len); return; } diff --git a/test/-ext-/string/test_cstr.rb b/test/-ext-/string/test_cstr.rb index 72a9dd6dfa..272e090955 100644 --- a/test/-ext-/string/test_cstr.rb +++ b/test/-ext-/string/test_cstr.rb @@ -93,6 +93,17 @@ class Test_StringCStr < Test::Unit::TestCase {}[string] = 1 non_terminated = "#{string}#{nil}" assert_nil(Bug::String.cstr_term_char(non_terminated), gh821) + + result = {} + WCHARS.map do |enc| + embedded_string = "ab".encode(enc) + string = embedded_string.gsub("b".encode(enc), "1".encode(enc)) + {}[string] = 1 + non_terminated = "#{string}#{nil}" + c = Bug::String.cstr_term_char(non_terminated) + result[enc] = c if c + end + assert_empty(result, gh821) end def assert_wchars_term_char(str) |