diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-03 01:41:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-03 01:41:56 +0000 |
commit | 351fbaf0f76f1a73edfb6434ee7cdfae9c27238d (patch) | |
tree | ab7fd94a15f5377ec52c32144b479991bb41b2db /string.c | |
parent | 9b47469a25939ec7071621cc6dffbe38a28e4710 (diff) | |
download | ruby-351fbaf0f76f1a73edfb6434ee7cdfae9c27238d.tar.gz |
* string.c (rb_str_shared_replace): fixed memory leak. a patch from
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
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -616,7 +616,10 @@ rb_str_shared_replace(VALUE str, VALUE str2) enc = STR_ENC_GET(str2); cr = ENC_CODERANGE(str2); 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) { STR_SET_EMBED(str); 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); return; } - if (!STR_SHARED_P(str) && !STR_EMBED_P(str)) { - xfree(RSTRING_PTR(str)); - } STR_SET_NOEMBED(str); STR_UNSET_NOCAPA(str); RSTRING(str)->as.heap.ptr = RSTRING_PTR(str2); |