From a3a55eb5508957ab4cf7f85ff1a8d80b8e3aa758 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 6 Aug 2004 16:01:02 +0000
Subject: [PATCH] * ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns ""
 instead of nil.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              | 4 ++++
 ext/zlib/zlib.c        | 5 ++++-
 test/zlib/test_zlib.rb | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c8c3a91992..ec148c3cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Aug  7 00:50:01 2004  Tanaka Akira  <akr@m17n.org>
+
+	* ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
+
 Mon Aug  3 13:49:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/namespace.rb: bug fix
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index e665b7b6b2..c5e9e7437c 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -2075,7 +2075,10 @@ gzfile_read(gz, len)
 {
     VALUE dst;
 
-    if (len <= 0) return Qnil;
+    if (len < 0)
+        rb_raise(rb_eArgError, "negative length %d given", len);
+    if (len == 0)
+	return rb_str_new(0, 0);
     while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled < len) {
 	gzfile_read_more(gz);
     }
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index 493bdab118..48e074750f 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -1,5 +1,6 @@
 require 'test/unit/testsuite'
 require 'test/unit/testcase'
+require 'stringio'
 
 begin
   require 'zlib'
@@ -7,6 +8,13 @@ rescue LoadError
 end
 
 if defined? Zlib
+  class TestZlibGzipReader < Test::Unit::TestCase
+    D0 = "\037\213\010\000S`\017A\000\003\003\000\000\000\000\000\000\000\000\000"
+    def test_read0
+      assert_equal("", Zlib::GzipReader.new(StringIO.new(D0)).read(0))
+    end
+  end
+
   class TestZlibGzipWriter < Test::Unit::TestCase
     def test_invalid_new
       # [ruby-dev:23228]