kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2012-02-05 03:27:41 +00:00
parent 83b5388b25
commit b657c159e9
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 08:21:28 2011 Koichi Sasada <ko1@atdot.net>
* vm_insnhelper.c (vm_getivar): check vm state version

3
string.c
View File

@ -4896,6 +4896,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;

2
version.h
View File

@ -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