diff options
| author | Stephan Mühlstrasser <stm@pdflib.com> | 2018-04-13 14:28:55 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-04-24 14:36:06 +0200 |
| commit | dd7521bcc1b7a6fcb53c31f9bd1192fcc884bd56 (patch) | |
| tree | f2b955ee5e5da25225901d8ed58379a7dfe65ca9 /lib/http_chunks.c | |
| parent | e6c22368c6e5426ec2b1cb8a3041ebc98d0ad402 (diff) | |
| download | curl-dd7521bcc1b7a6fcb53c31f9bd1192fcc884bd56.tar.gz | |
ctype: restore character classification for non-ASCII platforms
With commit 4272a0b0fc49a1ac0ceab5c4a365c9f6ab8bf8e2 curl-speficic
character classification macros and functions were introduced in
curl_ctype.[ch] to avoid dependencies on the locale. This broke curl on
non-ASCII, e.g. EBCDIC platforms. This change restores the previous set
of character classification macros when CURL_DOES_CONVERSIONS is
defined.
Closes #2494
Diffstat (limited to 'lib/http_chunks.c')
| -rw-r--r-- | lib/http_chunks.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/http_chunks.c b/lib/http_chunks.c index 8368eeca6..18dfcb282 100644 --- a/lib/http_chunks.c +++ b/lib/http_chunks.c @@ -74,6 +74,19 @@ */ +#ifdef CURL_DOES_CONVERSIONS +/* Check for an ASCII hex digit. + We avoid the use of ISXDIGIT to accommodate non-ASCII hosts. */ +static bool Curl_isxdigit_ascii(char digit) +{ + return (digit >= 0x30 && digit <= 0x39) /* 0-9 */ + || (digit >= 0x41 && digit <= 0x46) /* A-F */ + || (digit >= 0x61 && digit <= 0x66); /* a-f */ +} +#else +#define Curl_isxdigit_ascii(x) Curl_isxdigit(x) +#endif + void Curl_httpchunk_init(struct connectdata *conn) { struct Curl_chunker *chunk = &conn->chunk; @@ -119,7 +132,7 @@ CHUNKcode Curl_httpchunk_read(struct connectdata *conn, while(length) { switch(ch->state) { case CHUNK_HEX: - if(Curl_isxdigit(*datap)) { + if(Curl_isxdigit_ascii(*datap)) { if(ch->hexindex < MAXNUM_SIZE) { ch->hexbuffer[ch->hexindex] = *datap; datap++; |