Commit 30a46e11 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

John McGowan found a problem where the DEBUGFUNCTION was called with bad 

data on uploads.
parent 3a01478c

lib/transfer.c

+7 −6
Original line number Diff line number Diff line
@@ -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);