Commit 785d76d6 authored by Steve Holme's avatar Steve Holme
Browse files

transfer: Fixed existing scratch buffer being checked for NULL twice 

If the scratch buffer already existed when the CRLF conversion was
performed then the buffer pointer would be checked twice for NULL. This
second check is only necessary if the call to malloc() was performed by
the first check.
parent 9afd9702

lib/transfer.c

+5 −4
Original line number Diff line number Diff line
@@ -910,12 +910,13 @@ static CURLcode readwrite_upload(struct SessionHandle *data, 
         (data->set.prefer_ascii) ||

#endif

         (data->set.crlf))) {

        if(data->state.scratch == NULL)

        if(data->state.scratch == NULL) {

          data->state.scratch = malloc(2*BUFSIZE);

          if(data->state.scratch == NULL) {

            failf (data, "Failed to alloc scratch buffer!");

            return CURLE_OUT_OF_MEMORY;

          }

        }

        /*

         * ASCII/EBCDIC Note: This is presumably a text (not binary)

         * transfer so the data should already be in ASCII.