Commit edeabf74 authored by Serj Kalichev's avatar Serj Kalichev Committed by Daniel Stenberg
Browse files

TFTP: Fix upload problem with piped input 

When input stream for curl is stdin and input stream is not a file but
generated by a script then curl can truncate data transfer to arbitrary
size since a partial packet is treated as end of transfer by TFTP.

Fixes #857
parent 600bb4e8

lib/tftp.c

+15 −3
Original line number Diff line number Diff line
@@ -705,6 +705,7 @@ static CURLcode tftp_tx(tftp_state_data_t *state, tftp_event_t event) 
  int rblock;

  CURLcode result = CURLE_OK;

  struct SingleRequest *k = &data->req;

  int cb; /* Bytes currently read */



  switch(event) {
@@ -762,9 +763,20 @@ static CURLcode tftp_tx(tftp_state_data_t *state, tftp_event_t event) 
      return CURLE_OK;

    }



    result = Curl_fillreadbuffer(state->conn, state->blksize, &state->sbytes);

    /* TFTP considers data block size < 512 bytes as an end of session. So

     * in some cases we must wait for additional data to build full (512 bytes)

     * data block.

     * */

    state->sbytes = 0;

    state->conn->data->req.upload_fromhere = (char *)state->spacket.data+4;

    do {

      result = Curl_fillreadbuffer(state->conn, state->blksize - state->sbytes,

                                   &cb);

      if(result)

        return result;

      state->sbytes += cb;

      state->conn->data->req.upload_fromhere += cb;

    } while(state->sbytes < state->blksize && cb != 0);



    sbytes = sendto(state->sockfd, (void *) state->spacket.data,

                    4 + state->sbytes, SEND_4TH_ARG,