Unverified Commit 46e14b69 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

non-ascii: use iconv() with 'char **' argument 

Bug: https://curl.haxx.se/mail/lib-2017-09/0031.html
parent 2fc1db56

lib/non-ascii.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ CURLcode Curl_convert_to_network(struct Curl_easy *data, 
    /* call iconv */

    /* call iconv */

    input_ptr = output_ptr = buffer;

    input_ptr = output_ptr = buffer;

    in_bytes = out_bytes = length;

    in_bytes = out_bytes = length;

    rc = iconv(*cd, (const char **)&input_ptr, &in_bytes,

    rc = iconv(*cd, &input_ptr, &in_bytes,

               &output_ptr, &out_bytes);

               &output_ptr, &out_bytes);

    if(!data)

    if(!data)

      iconv_close(tmpcd);

      iconv_close(tmpcd);
@@ -182,7 +182,7 @@ CURLcode Curl_convert_from_network(struct Curl_easy *data, 
    /* call iconv */

    /* call iconv */

    input_ptr = output_ptr = buffer;

    input_ptr = output_ptr = buffer;

    in_bytes = out_bytes = length;

    in_bytes = out_bytes = length;

    rc = iconv(*cd, (const char **)&input_ptr, &in_bytes,

    rc = iconv(*cd, &input_ptr, &in_bytes,

               &output_ptr, &out_bytes);

               &output_ptr, &out_bytes);

    if(!data)

    if(!data)

      iconv_close(tmpcd);

      iconv_close(tmpcd);
@@ -224,7 +224,7 @@ CURLcode Curl_convert_from_utf8(struct Curl_easy *data, 
    /* do the translation ourselves */

    /* do the translation ourselves */

    iconv_t tmpcd = (iconv_t) -1;

    iconv_t tmpcd = (iconv_t) -1;

    iconv_t *cd = &tmpcd;

    iconv_t *cd = &tmpcd;

    const char *input_ptr;

    char *input_ptr;

    char *output_ptr;

    char *output_ptr;

    size_t in_bytes, out_bytes, rc;

    size_t in_bytes, out_bytes, rc;