* ext/stringio/stringio.c (strio_sysread): should not raise at empty

  read.  a patch from Arthur Schreiber at [ruby-core:17245].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e7e37b3b23..8136e1947e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 14 22:52:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_sysread): should not raise at empty
+	  read.  a patch from Arthur Schreiber at [ruby-core:17245].
+
 Sat Jun 14 22:16:09 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* configure.in: Fix $LOAD_PATH.  Properly expand vendor_ruby
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 913fed7a5c..584bea8f64 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -1230,7 +1230,7 @@ strio_sysread(argc, argv, self)
     VALUE self;
 {
     VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val) || RSTRING(val)->len == 0) {
+    if (NIL_P(val)) {
 	rb_eof_error();
     }
     return val;
diff --git a/version.h b/version.h
index cc673f51bf..b4d5b3596f 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-13"
+#define RUBY_RELEASE_DATE "2008-06-14"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080613
+#define RUBY_RELEASE_CODE 20080614
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];