From dd307cae31f98d578915637bdc91e98d5d1a608d Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 17 Jun 2007 15:56:36 +0000 Subject: * variable.c (rb_path2class): get rid of dangling pointer caused by optimized out value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ variable.c | 11 ++++++++--- version.h | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6df015627..9638f2e2c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 18 00:58:14 2007 Nobuyoshi Nakada + + * variable.c (rb_path2class): get rid of dangling pointer caused by + optimized out value. + Fri Jun 15 22:33:29 2007 Nobuyoshi Nakada * common.mk (realclean): separate local and ext. diff --git a/variable.c b/variable.c index 44e2403639..e00f1ef6eb 100644 --- a/variable.c +++ b/variable.c @@ -241,16 +241,21 @@ rb_path2class(path) const char *pbeg, *p; ID id; VALUE c = rb_cObject; + VALUE str = 0; if (path[0] == '#') { rb_raise(rb_eArgError, "can't retrieve anonymous class %s", path); } pbeg = p = path; while (*p) { - VALUE str; - while (*p && *p != ':') p++; - str = rb_str_new(pbeg, p-pbeg); + if (str) { + RSTRING(str)->len = 0; + rb_str_cat(str, pbeg, p-pbeg); + } + else { + str = rb_str_new(pbeg, p-pbeg); + } id = rb_intern(RSTRING(str)->ptr); if (p[0] == ':') { if (p[1] != ':') goto undefined_class; diff --git a/version.h b/version.h index 76614a096e..e917bb8133 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-06-15" +#define RUBY_RELEASE_DATE "2007-06-18" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070615 +#define RUBY_RELEASE_CODE 20070618 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 18 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3