yugui	2012-02-05 12:27:41 +0900 (Sun, 05 Feb 2012)

  New Revision: 34430

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34430

  Log:
    merges r32349 from trunk into ruby_1_9_2.
    --
    * string.c (tr_trans): free heap ptr when the str is not embeded.
      patched by Eric Wong. [Bug #4956] [ruby-core:37708]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/string.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 34429)
+++ ruby_1_9_2/ChangeLog	(revision 34430)
@@ -1,3 +1,8 @@
+Fri Jul  1 11:41:12 2011  NARUSE, Yui  <naruse@r...>
+
+	* 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 08:21:28 2011  Koichi Sasada  <ko1@a...>
 
 	* vm_insnhelper.c (vm_getivar): check vm state version
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 34429)
+++ ruby_1_9_2/string.c	(revision 34430)
@@ -4896,6 +4896,9 @@
 	    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;
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 34429)
+++ ruby_1_9_2/version.h	(revision 34430)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 314
+#define RUBY_PATCHLEVEL 315
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/