Author: stefan2
Date: Mon Oct 15 03:57:10 2012
New Revision: 1398193
URL: http://svn.apache.org/viewvc?rev=1398193&view=rev
Log:
* subversion/libsvn_ra_svn/marshal.c
(readbuf_skip): ensure 64 bit content lengths get parsed properly under
32 bits as well
Modified:
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1398193&r1=1398192&r2=1398193&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Mon Oct 15 03:57:10 2012
@@ -365,12 +365,12 @@ static svn_error_t *readbuf_input(svn_ra
}
/* Treat the next LEN input bytes from CONN as "read" */
-static svn_error_t *readbuf_skip(svn_ra_svn_conn_t *conn, apr_size_t len)
+static svn_error_t *readbuf_skip(svn_ra_svn_conn_t *conn, apr_uint64_t len)
{
do
{
apr_size_t buflen = conn->read_end - conn->read_ptr;
- apr_size_t copylen = (buflen < len) ? buflen : len;
+ apr_size_t copylen = (buflen < len) ? buflen : (apr_size_t)len;
conn->read_ptr += copylen;
len -= copylen;
if (len == 0)
