diff options
-rw-r--r-- | parse.y | 2 | ||||
-rw-r--r-- | string.c | 7 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -8760,7 +8760,7 @@ gettable(struct parser_params *p, ID id, const YYLTYPE *loc) if (NIL_P(file)) file = rb_str_new(0, 0); else - file = rb_str_dup(file); + file = rb_str_dup(rb_fstring(file)); node = NEW_STR(add_mark_object(p, file), loc); } return node; @@ -1164,6 +1164,13 @@ str_replace_shared_without_enc(VALUE str2, VALUE str) } else { str = rb_str_new_frozen(str); + if (!STR_EMBED_P(str2) && !FL_TEST_RAW(str2, STR_SHARED|STR_NOFREE)) { + /* TODO: check if str2 is a shared root */ + char *ptr2 = STR_HEAP_PTR(str2); + if (STR_HEAP_PTR(str) != ptr2) { + ruby_sized_xfree(ptr2, STR_HEAP_SIZE(str2)); + } + } FL_SET(str2, STR_NOEMBED); RSTRING_GETMEM(str, ptr, len); RSTRING(str2)->as.heap.len = len; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.3" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 82 +#define RUBY_PATCHLEVEL 83 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 8 |