Commit 539d17b0 authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

transfer.c: do not compute length of undefined hex buffer. 

On non-ascii platforms, the chunked hex header was measured for char code
conversion length, even for chunked trailers that do not have an hex header.
In addition, the efective length is already known: use it.
Since the hex length can be zero, only convert if needed.

Reported by valgrind.
parent a75de9de

lib/transfer.c

+10 −8
Original line number Diff line number Diff line
@@ -296,10 +296,10 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, size_t bytes, 
       here, knowing they'll become CRLFs later on.

     */



    char hexbuffer[11];

    char hexbuffer[11] = "";

    int hexlen = 0;

    const char *endofline_native;

    const char *endofline_network;

    int hexlen = 0;



    if(

#ifdef CURL_DO_LINEEND_CONV
@@ -354,13 +354,15 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, size_t bytes, 
        length = nread;

      else

        /* just translate the protocol portion */

        length = strlen(hexbuffer);

        length = hexlen;

      if(length) {

        result = Curl_convert_to_network(data, data->req.upload_fromhere,

                                         length);

        /* Curl_convert_to_network calls failf if unsuccessful */

        if(result)

          return result;

      }

    }

#endif /* CURL_DOES_CONVERSIONS */



#ifndef CURL_DISABLE_HTTP