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

* string.c (rb_str_shared_replace): fixed memory leak. a patch from

Browse Source 
shinichiro.h <shinichiro.hamaji AT gmail.com> at [ruby-dev:35742]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-08-03 01:41:56 +00:00
parent 9b47469a25
commit 351fbaf0f7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Aug 3 10:41:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_shared_replace): fixed memory leak. a patch from
shinichiro.h <shinichiro.hamaji AT gmail.com> at [ruby-dev:35742]
Sat Aug 2 22:55:41 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> Sat Aug 2 22:55:41 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* test/win32ole/test_err_in_callback.rb: remove temporary files. * test/win32ole/test_err_in_callback.rb: remove temporary files.

8
string.c
View File

@ -616,7 +616,10 @@ rb_str_shared_replace(VALUE str, VALUE str2)
enc = STR_ENC_GET(str2); enc = STR_ENC_GET(str2);
cr = ENC_CODERANGE(str2); cr = ENC_CODERANGE(str2);
rb_str_modify(str); rb_str_modify(str);
if (OBJ_TAINTED(str2)) OBJ_TAINT(str); OBJ_INFECT(str, str2);
if (!STR_SHARED_P(str) && !STR_EMBED_P(str)) {
xfree(RSTRING_PTR(str));
}
if (RSTRING_LEN(str2) <= RSTRING_EMBED_LEN_MAX) { if (RSTRING_LEN(str2) <= RSTRING_EMBED_LEN_MAX) {
STR_SET_EMBED(str); STR_SET_EMBED(str);
memcpy(RSTRING_PTR(str), RSTRING_PTR(str2), RSTRING_LEN(str2)+1); memcpy(RSTRING_PTR(str), RSTRING_PTR(str2), RSTRING_LEN(str2)+1);
@ -625,9 +628,6 @@ rb_str_shared_replace(VALUE str, VALUE str2)
ENC_CODERANGE_SET(str, cr); ENC_CODERANGE_SET(str, cr);
return; return;
} }
if (!STR_SHARED_P(str) && !STR_EMBED_P(str)) {
xfree(RSTRING_PTR(str));
}
STR_SET_NOEMBED(str); STR_SET_NOEMBED(str);
STR_UNSET_NOCAPA(str); STR_UNSET_NOCAPA(str);
RSTRING(str)->as.heap.ptr = RSTRING_PTR(str2); RSTRING(str)->as.heap.ptr = RSTRING_PTR(str2);