summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:20 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 20:56:20 (GMT)
commit6afb98b298fa61de96d24395ef5f133af814d62e (patch)
treed1b6faf15b76fe426b67a02f0a0350e265019cf5
parentd10ee17ba71098ed3b372d337eb8d42a158550b8 (diff)
parent59e55b2b8e43ed773f5b5ad58b4d53a8b673b93f (diff)
sorry. I made wrong tags.v1_8_5_59
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_59@13005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--variable.c11
-rw-r--r--version.h2
3 files changed, 4 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b46009..82a6cd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Thu Aug 16 04:30:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_path2class): get rid of dangling pointer caused by
- optimized out value.
-
Thu Aug 16 04:24:28 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
diff --git a/variable.c b/variable.c
index 4231a75..a51dd9e 100644
--- a/variable.c
+++ b/variable.c
@@ -241,21 +241,16 @@ 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++;
- if (str) {
- RSTRING(str)->len = 0;
- rb_str_cat(str, pbeg, p-pbeg);
- }
- else {
- str = rb_str_new(pbeg, p-pbeg);
- }
+ 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 80f9095..5170ec7 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-16"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20070816
-#define RUBY_PATCHLEVEL 60
+#define RUBY_PATCHLEVEL 59
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8