From 3b68e2bd1c933d98f0b51ccf815ada251db02291 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 25 Dec 2007 06:38:00 +0000 Subject: * io.c (appendline): initialize rslen to 1 if rsptr is 0. rslen should be the length of the delimiter. if only delim is given, it should be 1. [ruby-dev:32746] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ io.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index cb89ce57b..037f862ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 25 15:24:57 2007 Tanaka Akira + + * io.c (appendline): initialize rslen to 1 if rsptr is 0. + rslen is the length of the delimiter. + if only delim is given, it should be 1. + [ruby-dev:32746] + Tue Dec 25 15:21:33 2007 Nobuyoshi Nakada * transcode.c (transcode_dispatch): fix for multistep transcode. diff --git a/io.c b/io.c index 4b392b8d2..9556b98ff 100644 --- a/io.c +++ b/io.c @@ -1672,6 +1672,9 @@ appendline(rb_io_t *fptr, int delim, const char *rsptr, int rslen, VALUE rs, VAL long limit = *lp; rb_encoding *enc = io_input_encoding(fptr); + if (rsptr == 0) + rslen = 1; + do { long pending = READ_DATA_PENDING_COUNT(fptr); if (pending > 0) { -- cgit