diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2018-02-10 15:13:15 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-02-15 09:36:03 +0100 |
| commit | b46cfbc068ebe90f18e9777b9e877e4934c1b5e3 (patch) | |
| tree | 4d88b0f4d9492f51a93251e488400ff7a8abba62 /lib/non-ascii.c | |
| parent | 43a50a2580db2bfb28483a96964ae27b584472da (diff) | |
| download | curl-b46cfbc068ebe90f18e9777b9e877e4934c1b5e3.tar.gz | |
TODO fixed: Detect when called from within callbacks
Closes #2302
Diffstat (limited to 'lib/non-ascii.c')
| -rw-r--r-- | lib/non-ascii.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/non-ascii.c b/lib/non-ascii.c index 92b2f8d73..d0e98266b 100644 --- a/lib/non-ascii.c +++ b/lib/non-ascii.c @@ -84,7 +84,10 @@ CURLcode Curl_convert_to_network(struct Curl_easy *data, { if(data && data->set.convtonetwork) { /* use translation callback */ - CURLcode result = data->set.convtonetwork(buffer, length); + CURLcode result; + Curl_set_in_callback(data, true); + result = data->set.convtonetwork(buffer, length); + Curl_set_in_callback(data, false); if(result) { failf(data, "CURLOPT_CONV_TO_NETWORK_FUNCTION callback returned %d: %s", @@ -147,7 +150,10 @@ CURLcode Curl_convert_from_network(struct Curl_easy *data, { if(data && data->set.convfromnetwork) { /* use translation callback */ - CURLcode result = data->set.convfromnetwork(buffer, length); + CURLcode result; + Curl_set_in_callback(data, true); + result = data->set.convfromnetwork(buffer, length); + Curl_set_in_callback(data, false); if(result) { failf(data, "CURLOPT_CONV_FROM_NETWORK_FUNCTION callback returned %d: %s", @@ -210,7 +216,10 @@ CURLcode Curl_convert_from_utf8(struct Curl_easy *data, { if(data && data->set.convfromutf8) { /* use translation callback */ - CURLcode result = data->set.convfromutf8(buffer, length); + CURLcode result; + Curl_set_in_callback(data, true); + result = data->set.convfromutf8(buffer, length); + Curl_set_in_callback(data, false); if(result) { failf(data, "CURLOPT_CONV_FROM_UTF8_FUNCTION callback returned %d: %s", |