1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (rb_str_upto): String#upto from empty string makes

Browse Source 
inifinite loop.  [ruby-core:09864]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-01-08 18:58:31 +00:00
parent fe6e716424
commit af040cb612
2 changed files with 6 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 @@
Tue Jan 9 03:54:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_upto): String#upto from empty string makes
inifinite loop. [ruby-core:09864]
Sun Jan 7 18:36:05 2007 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_stop_timer_thread(), rb_thread_reset_timer_thread(),

2
string.c
View File

@ -1568,7 +1568,7 @@ rb_str_upto(VALUE beg, VALUE end, int excl)
StringValue(current);
if (excl && rb_str_equal(current, end)) break;
StringValue(current);
if (RSTRING_LEN(current) > RSTRING_LEN(end))
if (RSTRING_LEN(current) > RSTRING_LEN(end) || RSTRING(current)->len == 0)
break;
}