moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

non-ascii: allow conversion functions to be called with a NULL data handle.

Browse Source
This commit is contained in:
Patrick Monnerat 2017-09-02 12:45:21 +01:00
parent 3b51fa6285
commit 70231d6a65
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/non-ascii.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -82,7 +82,7 @@ CURLcode Curl_convert_clone(struct Curl_easy *data,
CURLcode Curl_convert_to_network(struct Curl_easy *data, CURLcode Curl_convert_to_network(struct Curl_easy *data,
char *buffer, size_t length) char *buffer, size_t length)
{ {
if(data->set.convtonetwork) { if(data && data->set.convtonetwork) {
/* use translation callback */ /* use translation callback */
CURLcode result = data->set.convtonetwork(buffer, length); CURLcode result = data->set.convtonetwork(buffer, length);
if(result) { if(result) {
@ -96,14 +96,18 @@ CURLcode Curl_convert_to_network(struct Curl_easy *data,
else { else {
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
/* do the translation ourselves */ /* do the translation ourselves */
iconv_t tmpcd = (iconv_t) -1;
iconv_t *cd = &tmpcd;
char *input_ptr, *output_ptr; char *input_ptr, *output_ptr;
size_t in_bytes, out_bytes, rc; size_t in_bytes, out_bytes, rc;
/* open an iconv conversion descriptor if necessary */ /* open an iconv conversion descriptor if necessary */
if(data->outbound_cd == (iconv_t)-1) { if(data)
data->outbound_cd = iconv_open(CURL_ICONV_CODESET_OF_NETWORK, cd = &data->outbound_cd;
CURL_ICONV_CODESET_OF_HOST); if(*cd == (iconv_t)-1) {
if(data->outbound_cd == (iconv_t)-1) { *cd = iconv_open(CURL_ICONV_CODESET_OF_NETWORK,
CURL_ICONV_CODESET_OF_HOST);
if(*cd == (iconv_t)-1) {
failf(data, failf(data,
"The iconv_open(\"%s\", \"%s\") call failed with errno %i: %s", "The iconv_open(\"%s\", \"%s\") call failed with errno %i: %s",
CURL_ICONV_CODESET_OF_NETWORK, CURL_ICONV_CODESET_OF_NETWORK,
@ -115,8 +119,10 @@ 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(data->outbound_cd, (const char **)&input_ptr, &in_bytes, rc = iconv(*cd, (const char **)&input_ptr, &in_bytes,
&output_ptr, &out_bytes); &output_ptr, &out_bytes);
if(!data)
iconv_close(tmpcd);
if((rc == ICONV_ERROR) || (in_bytes != 0)) { if((rc == ICONV_ERROR) || (in_bytes != 0)) {
failf(data, failf(data,
"The Curl_convert_to_network iconv call failed with errno %i: %s", "The Curl_convert_to_network iconv call failed with errno %i: %s",
@ -139,7 +145,7 @@ CURLcode Curl_convert_to_network(struct Curl_easy *data,
CURLcode Curl_convert_from_network(struct Curl_easy *data, CURLcode Curl_convert_from_network(struct Curl_easy *data,
char *buffer, size_t length) char *buffer, size_t length)
{ {
if(data->set.convfromnetwork) { if(data && data->set.convfromnetwork) {
/* use translation callback */ /* use translation callback */
CURLcode result = data->set.convfromnetwork(buffer, length); CURLcode result = data->set.convfromnetwork(buffer, length);
if(result) { if(result) {
@ -153,14 +159,18 @@ CURLcode Curl_convert_from_network(struct Curl_easy *data,
else { else {
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
/* do the translation ourselves */ /* do the translation ourselves */
iconv_t tmpcd = (iconv_t) -1;
iconv_t *cd = &tmpcd;
char *input_ptr, *output_ptr; char *input_ptr, *output_ptr;
size_t in_bytes, out_bytes, rc; size_t in_bytes, out_bytes, rc;
/* open an iconv conversion descriptor if necessary */ /* open an iconv conversion descriptor if necessary */
if(data->inbound_cd == (iconv_t)-1) { if(data)
data->inbound_cd = iconv_open(CURL_ICONV_CODESET_OF_HOST, cd = &data->inbound_cd;
CURL_ICONV_CODESET_OF_NETWORK); if(*cd == (iconv_t)-1) {
if(data->inbound_cd == (iconv_t)-1) { *cd = iconv_open(CURL_ICONV_CODESET_OF_HOST,
CURL_ICONV_CODESET_OF_NETWORK);
if(*cd == (iconv_t)-1) {
failf(data, failf(data,
"The iconv_open(\"%s\", \"%s\") call failed with errno %i: %s", "The iconv_open(\"%s\", \"%s\") call failed with errno %i: %s",
CURL_ICONV_CODESET_OF_HOST, CURL_ICONV_CODESET_OF_HOST,
@ -172,8 +182,10 @@ 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(data->inbound_cd, (const char **)&input_ptr, &in_bytes, rc = iconv(*cd, (const char **)&input_ptr, &in_bytes,
&output_ptr, &out_bytes); &output_ptr, &out_bytes);
if(!data)
iconv_close(tmpcd);
if((rc == ICONV_ERROR) || (in_bytes != 0)) { if((rc == ICONV_ERROR) || (in_bytes != 0)) {
failf(data, failf(data,
"Curl_convert_from_network iconv call failed with errno %i: %s", "Curl_convert_from_network iconv call failed with errno %i: %s",
@ -196,7 +208,7 @@ CURLcode Curl_convert_from_network(struct Curl_easy *data,
CURLcode Curl_convert_from_utf8(struct Curl_easy *data, CURLcode Curl_convert_from_utf8(struct Curl_easy *data,
char *buffer, size_t length) char *buffer, size_t length)
{ {
if(data->set.convfromutf8) { if(data && data->set.convfromutf8) {
/* use translation callback */ /* use translation callback */
CURLcode result = data->set.convfromutf8(buffer, length); CURLcode result = data->set.convfromutf8(buffer, length);
if(result) { if(result) {
@ -210,15 +222,19 @@ CURLcode Curl_convert_from_utf8(struct Curl_easy *data,
else { else {
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
/* do the translation ourselves */ /* do the translation ourselves */
iconv_t tmpcd = (iconv_t) -1;
iconv_t *cd = &tmpcd;
const char *input_ptr; const char *input_ptr;
char *output_ptr; char *output_ptr;
size_t in_bytes, out_bytes, rc; size_t in_bytes, out_bytes, rc;
/* open an iconv conversion descriptor if necessary */ /* open an iconv conversion descriptor if necessary */
if(data->utf8_cd == (iconv_t)-1) { if(data)
data->utf8_cd = iconv_open(CURL_ICONV_CODESET_OF_HOST, cd = &data->utf8_cd;
CURL_ICONV_CODESET_FOR_UTF8); if(*cd == (iconv_t)-1) {
if(data->utf8_cd == (iconv_t)-1) { *cd = iconv_open(CURL_ICONV_CODESET_OF_HOST,
CURL_ICONV_CODESET_FOR_UTF8);
if(*cd == (iconv_t)-1) {
failf(data, failf(data,
"The iconv_open(\"%s\", \"%s\") call failed with errno %i: %s", "The iconv_open(\"%s\", \"%s\") call failed with errno %i: %s",
CURL_ICONV_CODESET_OF_HOST, CURL_ICONV_CODESET_OF_HOST,
@ -230,8 +246,10 @@ CURLcode Curl_convert_from_utf8(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(data->utf8_cd, &input_ptr, &in_bytes, rc = iconv(*cd, &input_ptr, &in_bytes,
&output_ptr, &out_bytes); &output_ptr, &out_bytes);
if(!data)
iconv_close(tmpcd);
if((rc == ICONV_ERROR) || (in_bytes != 0)) { if((rc == ICONV_ERROR) || (in_bytes != 0)) {
failf(data, failf(data,
"The Curl_convert_from_utf8 iconv call failed with errno %i: %s", "The Curl_convert_from_utf8 iconv call failed with errno %i: %s",