summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-01 05:28:48 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-01 05:28:48 +0000
commitf4dda52025433e232f931ffa1cb0473684128a5a (patch)
tree7746234330c6617c8e4a6cb7c3b89e98f52d2495
parentc05fd75befe5b6021e7926452d6813c3472f540f (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--ChangeLog5
-rw-r--r--string.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b80165670d..5cdfe6ceda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/string.c b/string.c
index 9a85f81493..711918b4e6 100644
--- a/string.c
+++ b/string.c
@@ -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;