diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-26 15:19:39 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-26 15:19:39 +0000 |
commit | 99c58e9ebcb90a81c2b6201d1d11ac1d5bd84604 (patch) | |
tree | 8fbff180158527db9fe6b0aca100f1bb21110004 | |
parent | 883fadf9affab1ab72233d23ecdbb8894a3ca1e5 (diff) | |
download | ruby-99c58e9ebcb90a81c2b6201d1d11ac1d5bd84604.tar.gz |
* string.c (rb_str_clear): need to check STR_EMBED_P() before
free()ing memory. a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
[ruby-dev:31062]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Jun 27 00:18:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * string.c (rb_str_clear): need to check STR_EMBED_P() before + free()ing memory. a patch from Yusuke ENDOH <mame AT tsg.ne.jp>. + [ruby-dev:31062] + Tue Jun 26 16:39:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * process.c (proc_getgroups): use GIDT2NUM for rb_gid_t. @@ -2347,7 +2347,7 @@ static VALUE rb_str_clear(VALUE str) { /* rb_str_modify() */ /* no need for str_make_independent */ - if (str_independent(str)) { + if (str_independent(str) && !STR_EMBED_P(str)) { free(RSTRING_PTR(str)); } STR_SET_EMBED(str); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-06-26" +#define RUBY_RELEASE_DATE "2007-06-27" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070626 +#define RUBY_RELEASE_CODE 20070627 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |