svn commit: r1804672 - /subversion/trunk/subversion/libsvn_client/import.c

[ko...@apache.org]

Author: kotkov
Date: Thu Aug 10 14:01:34 2017
New Revision: 1804672

URL: http://svn.apache.org/viewvc?rev=1804672&view=rev
Log:
Following up on r1803144, fix an oversight in the txdelta_next_window
adapter used when importing files over HTTP.

This bug has inadvertently disabled the checksum validation for such
imports, because the resulting checksum has always been all-zeroes.

* subversion/libsvn_client/import.c
  (txdelta_next_window): Check if the svn_txdelta_window_t pointer
   is null, instead of checking that for the pointer to a pointer, which
   is never null.

Modified:
    subversion/trunk/subversion/libsvn_client/import.c

Modified: subversion/trunk/subversion/libsvn_client/import.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/import.c?rev=1804672&r1=1804671&r2=1804672&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/import.c (original)
+++ subversion/trunk/subversion/libsvn_client/import.c Thu Aug 10 14:01:34 2017
@@ -87,7 +87,7 @@ txdelta_next_window(svn_txdelta_window_t
   struct txdelta_stream_baton_t *b = baton;
 
   SVN_ERR(svn_txdelta_next_window(window, b->txstream, pool));
-  if (!window)
+  if (!*window)
     {
       memcpy(b->digest_buffer, svn_txdelta_md5_digest(b->txstream),
              APR_MD5_DIGESTSIZE);