summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-25 06:38:00 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-25 06:38:00 +0000
commit3b68e2bd1c933d98f0b51ccf815ada251db02291 (patch)
tree6be30ce66ecec522249d981e989611ad647906e0
parent4c3f96ae6bd6482a9ce5b52849261380be2dfd9a (diff)
downloadruby-3b68e2bd1c933d98f0b51ccf815ada251db02291.tar.gz
ruby-3b68e2bd1c933d98f0b51ccf815ada251db02291.tar.xz
ruby-3b68e2bd1c933d98f0b51ccf815ada251db02291.zip
* 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
-rw-r--r--ChangeLog7
-rw-r--r--io.c3
2 files changed, 10 insertions, 0 deletions
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 <akr@fsij.org>
+
+ * 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 <nobu@ruby-lang.org>
* 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) {