diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-01 05:28:48 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-01 05:28:48 +0000 |
commit | f4dda52025433e232f931ffa1cb0473684128a5a (patch) | |
tree | 7746234330c6617c8e4a6cb7c3b89e98f52d2495 | |
parent | c05fd75befe5b6021e7926452d6813c3472f540f (diff) |
* string.c (tr_trans): free heap ptr when the str is not embeded.
patched by Eric Wong. [Bug #4956] [ruby-core:37708]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Fri Jul 1 11:41:12 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * string.c (tr_trans): free heap ptr when the str is not embeded. + patched by Eric Wong. [Bug #4956] [ruby-core:37708] + Fri Jul 1 11:07:43 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * thread.c (do_select): fix memory leak. @@ -5117,6 +5117,9 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag) CHECK_IF_ASCII(c); t += tlen; } + if (!STR_EMBED_P(str)) { + xfree(RSTRING(str)->as.heap.ptr); + } *t = '\0'; RSTRING(str)->as.heap.ptr = buf; RSTRING(str)->as.heap.len = t - buf; |