diff options
author | NARUSE, Yui <naruse@airemix.jp> | 2023-03-17 10:56:18 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2023-03-17 10:56:18 +0900 |
commit | b309c246ee70926d593d3857e1625202e2d0f67b (patch) | |
tree | 69606f61bf37b084da1451013cde4976230b0c7f | |
parent | b73a07359758a9034996752e981e09ddaffe8d87 (diff) | |
download | ruby-b309c246ee70926d593d3857e1625202e2d0f67b.tar.gz |
merge revision(s) d78ae78fd76e556e281a743c75bea4c0bb81ed8c: [Backport #19468]
rb_str_modify_expand: clear the string coderange
[Bug #19468]
b0b9f7201acab05c2a3ad92c3043a1f01df3e17f errornously stopped
clearing the coderange.
Since `rb_str_modify` clears it, `rb_str_modify_expand`
should too.
---
string.c | 1 +
1 file changed, 1 insertion(+)
-rw-r--r-- | string.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -2460,6 +2460,7 @@ rb_str_modify_expand(VALUE str, long expand) else if (expand > 0) { RESIZE_CAPA_TERM(str, len + expand, termlen); } + ENC_CODERANGE_CLEAR(str); } /* As rb_str_modify(), but don't clear coderange */ @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 40 +#define RUBY_PATCHLEVEL 41 #include "ruby/version.h" #include "ruby/internal/abi.h" |