summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-18 23:47:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-10-18 23:47:06 +0000
commit65bc8c10e8f25ac591399d30ed1dbc6d02d39ea5 (patch)
tree6e84eea97806f68842cb97cfeda3eb2861277f58
parent65d7e55d11da368ec8c7ab600dcd6df53b1b5e3b (diff)
downloadruby-65bc8c10e8f25ac591399d30ed1dbc6d02d39ea5.tar.gz
ruby-65bc8c10e8f25ac591399d30ed1dbc6d02d39ea5.tar.xz
ruby-65bc8c10e8f25ac591399d30ed1dbc6d02d39ea5.zip
* string.c (rb_str_upto): method result must be checked. [ruby-dev:24504]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--string.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c97883b83..4a1a4ce07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 19 08:46:57 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_upto): method result must be checked. [ruby-dev:24504]
+
Mon Oct 18 23:37:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_object0): check inheritance by the internal function.
diff --git a/string.c b/string.c
index d70ea2186..75e828e7d 100644
--- a/string.c
+++ b/string.c
@@ -1408,6 +1408,7 @@ rb_str_upto(beg, end, excl)
rb_yield(current);
if (!excl && rb_str_equal(current, end)) break;
current = rb_funcall(current, succ, 0, 0);
+ StringValue(current);
if (excl && rb_str_equal(current, end)) break;
if (RSTRING(current)->len > RSTRING(end)->len)
break;