From 351fbaf0f76f1a73edfb6434ee7cdfae9c27238d Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 3 Aug 2008 01:41:56 +0000 Subject: * string.c (rb_str_shared_replace): fixed memory leak. a patch from shinichiro.h at [ruby-dev:35742] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19ad28d58a..ae62e0f012 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Aug 3 10:41:54 2008 Nobuyoshi Nakada + + * string.c (rb_str_shared_replace): fixed memory leak. a patch from + shinichiro.h at [ruby-dev:35742] + Sat Aug 2 22:55:41 2008 Masaki Suketa * test/win32ole/test_err_in_callback.rb: remove temporary files. diff --git a/string.c b/string.c index c031063acc..0231109f6e 100644 --- a/string.c +++ b/string.c @@ -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); -- cgit v1.2.3