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

string.c: fix NOFREE

Browse Source 
* string.c (str_make_independent_expand): drop NOFREE flag after
  reallocation, static buffer is not pointed anymore.
  [ruby-core:65317] [Bug #10304]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-09-29 13:54:37 +00:00
parent 2f2f92b73e
commit ef08f00541
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Sep 29 22:54:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (str_make_independent_expand): drop NOFREE flag after
reallocation, static buffer is not pointed anymore.
[ruby-core:65317] [Bug #10304]
Sun Sep 28 23:59:17 2014 Kazuki Tsujimoto <kazuki@callcc.net> Sun Sep 28 23:59:17 2014 Kazuki Tsujimoto <kazuki@callcc.net>
* gc.c (rb_gcdebug_print_obj_condition): use RVALUE_REMEMBERED * gc.c (rb_gcdebug_print_obj_condition): use RVALUE_REMEMBERED

2
string.c
View File

@ -1577,7 +1577,7 @@ str_make_independent_expand(VALUE str, long expand)
memcpy(ptr, RSTRING_PTR(str), len); memcpy(ptr, RSTRING_PTR(str), len);
} }
STR_SET_NOEMBED(str); STR_SET_NOEMBED(str);
FL_UNSET(str, STR_SHARED); FL_UNSET(str, STR_SHARED|STR_NOFREE);
TERM_FILL(ptr + len, termlen); TERM_FILL(ptr + len, termlen);
RSTRING(str)->as.heap.ptr = ptr; RSTRING(str)->as.heap.ptr = ptr;
RSTRING(str)->as.heap.len = len; RSTRING(str)->as.heap.len = len;