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

[Bug #20787] Check the separator in IO#readline as well as 3.2

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-10-07 11:06:44 +09:00
parent ec526c61c9
commit 773d140f65
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2024-10-07 02:42:31 +00:00 
Merged: https://github.com/ruby/ruby/pull/11811
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
io.c
View File

@ -4396,23 +4396,31 @@ rb_io_set_lineno(VALUE io, VALUE lineno)
static VALUE
io_readline(rb_execution_context_t *ec, VALUE io, VALUE sep, VALUE lim, VALUE chomp)
{
long limit = -1;
if (NIL_P(lim)) {
VALUE tmp = Qnil;
// If sep is specified, but it's not a string and not nil, then assume
// it's the limit (it should be an integer)
if (!NIL_P(sep) && NIL_P(rb_check_string_type(sep))) {
if (!NIL_P(sep) && NIL_P(tmp = rb_check_string_type(sep))) {
// If the user has specified a non-nil / non-string value
// for the separator, we assume it's the limit and set the
// separator to default: rb_rs.
lim = sep;
limit = NUM2LONG(lim);
sep = rb_rs;
}
else {
sep = tmp;
}
}
else {
if (!NIL_P(sep)) StringValue(sep);
limit = NUM2LONG(lim);
}
if (!NIL_P(sep)) {
StringValue(sep);
}
check_getline_args(&sep, &limit, io);
VALUE line = rb_io_getline_1(sep, NIL_P(lim) ? -1L : NUM2LONG(lim), RTEST(chomp), io);
VALUE line = rb_io_getline_1(sep, limit, RTEST(chomp), io);
rb_lastline_set_up(line, 1);
if (NIL_P(line)) {

8
test/ruby/test_io.rb
View File

@ -2002,6 +2002,14 @@ class TestIO < Test::Unit::TestCase
end
end
def test_readline_incompatible_rs
first_line = File.open(__FILE__, &:gets).encode("utf-32le")
File.open(__FILE__, encoding: "utf-8:utf-32le") {|f|
assert_equal first_line, f.readline
assert_raise(ArgumentError) {f.readline("\0")}
}
end
def test_set_lineno_readline
pipe(proc do |w|
w.puts "foo"