1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set encoding before concatenating to string

Browse Source 
If we set encoding after the call to rb_str_buf_cat, then rb_str_buf_cat
will not set the correct terminator length.
This commit is contained in:
Peter Zhu 2022-01-06 13:32:59 -05:00
parent ee4784c06e
commit 44368b5f8b
Notes: git 2022-01-07 04:34:00 +09:00 
Merged: https://github.com/ruby/ruby/pull/5399
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
string.c
View File

@ -3186,8 +3186,8 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len,
if (len == 0) if (len == 0)
return str; return str;
if (RSTRING_LEN(str) == 0) { if (RSTRING_LEN(str) == 0) {
rb_str_buf_cat(str, ptr, len);
ENCODING_CODERANGE_SET(str, ptr_encindex, ptr_cr); ENCODING_CODERANGE_SET(str, ptr_encindex, ptr_cr);
rb_str_buf_cat(str, ptr, len);
return str; return str;
} }
goto incompatible; goto incompatible;