svn commit: r1125834 - in /subversion/trunk/subversion: libsvn_subr/stream.c tests/libsvn_subr/stream-test.c

[st...@apache.org]

Author: stsp
Date: Sat May 21 22:15:13 2011
New Revision: 1125834

URL: http://svn.apache.org/viewvc?rev=1125834&view=rev
Log:
* subversion/libsvn_subr/stream.c
  (read_handler_gz): Exit early if the underlying stream ran out instead
   of trying to decompress more data. Based on an initial diff by Ivan.

* subversion/tests/libsvn_subr/stream-test.c
  (test_funcs): Remove XFAIL marker from test_stream_compressed_empty_file.

Modified:
    subversion/trunk/subversion/libsvn_subr/stream.c
    subversion/trunk/subversion/tests/libsvn_subr/stream-test.c

Modified: subversion/trunk/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/stream.c?rev=1125834&r1=1125833&r2=1125834&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/stream.c (original)
+++ subversion/trunk/subversion/libsvn_subr/stream.c Sat May 21 22:15:13 2011
@@ -1156,6 +1156,13 @@ read_handler_gz(void *baton, char *buffe
                                  &btn->in->avail_in, &btn->read_flush));
         }
 
+      /* Short read means underlying stream has run out. */
+      if (btn->in->avail_in == 0)
+        {
+          *len = 0;
+          return SVN_NO_ERROR;
+        }
+
       zerr = inflate(btn->in, btn->read_flush);
       if (zerr == Z_STREAM_END)
         break;

Modified: subversion/trunk/subversion/tests/libsvn_subr/stream-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/stream-test.c?rev=1125834&r1=1125833&r2=1125834&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/stream-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/stream-test.c Sat May 21 22:15:13 2011
@@ -565,7 +565,7 @@ struct svn_test_descriptor_t test_funcs[
                    "test stream seeking for translated streams"),
     SVN_TEST_PASS2(test_readonly,
                    "test setting a file readonly"),
-    SVN_TEST_XFAIL2(test_stream_compressed_empty_file,
+    SVN_TEST_PASS2(test_stream_compressed_empty_file,
                    "test compressed streams with empty files"),
     SVN_TEST_NULL
   };