From: Daniel Stenberg Date: Wed, 29 Jan 2003 12:52:45 +0000 (+0000) Subject: John McGowan found a problem where the DEBUGFUNCTION was called with bad X-Git-Tag: curl-7_10_4~165 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30a46e1135f4d2cfc8d322a0ec3bf9557d93f124;p=curl John McGowan found a problem where the DEBUGFUNCTION was called with bad data on uploads. --- diff --git a/lib/transfer.c b/lib/transfer.c index 413eaeba2..e8cad9e3f 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1007,7 +1007,13 @@ CURLcode Curl_readwrite(struct connectdata *conn, &bytes_written); /* actually send away */ if(result) return result; - else if(conn->upload_present != bytes_written) { + + if(data->set.verbose) + /* show the data before we change the pointer upload_fromhere */ + Curl_debug(data, CURLINFO_DATA_OUT, conn->upload_fromhere, + bytes_written); + + if(conn->upload_present != bytes_written) { /* we only wrote a part of the buffer (if anything), deal with it! */ /* store the amount of bytes left in the buffer to write */ @@ -1032,11 +1038,6 @@ CURLcode Curl_readwrite(struct connectdata *conn, } } - if(data->set.verbose) - Curl_debug(data, CURLINFO_DATA_OUT, conn->upload_fromhere, - bytes_written); - - k->writebytecount += bytes_written; Curl_pgrsSetUploadCounter(data, (double)k->writebytecount);