Commit 9afd9702 authored by Steve Holme's avatar Steve Holme
Browse files

smtp: Fixed dot stuffing being performed when no new data read 

Whilst I had moved the dot stuffing code from being performed before
CRLF conversion takes place to after it, in commit 4bd860a0, I had
moved it outside the 'when something read' block of code when meant
it could perform the dot stuffing twice on partial send if nread
happened to contain the right values. It also meant the function could
potentially read past the end of buffer. This was highlighted by the
following warning:

warning: `nread' might be used uninitialized in this function
parent 5409f329

lib/transfer.c

+9 −8
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ static CURLcode readwrite_upload(struct SessionHandle *data, 
          else

            data->state.scratch[si] = data->req.upload_fromhere[i];

        }



        if(si != nread) {

          /* only perform the special operation if we really did replace

             anything */
@@ -947,11 +948,6 @@ static CURLcode readwrite_upload(struct SessionHandle *data, 
          data->req.upload_present = nread;

        }

      }

    } /* if 0 == data->req.upload_present */

    else {

      /* We have a partial buffer left from a previous "round". Use

         that instead of reading more data */

    }



#ifndef CURL_DISABLE_SMTP

      if(conn->handler->protocol & PROTO_FAMILY_SMTP) {
@@ -960,6 +956,11 @@ static CURLcode readwrite_upload(struct SessionHandle *data, 
          return result;

      }

#endif /* CURL_DISABLE_SMTP */

    } /* if 0 == data->req.upload_present */

    else {

      /* We have a partial buffer left from a previous "round". Use

         that instead of reading more data */

    }



    /* write to socket (send away data) */

    result = Curl_write(conn,