diff options
author | Daniel Stenberg <daniel@haxx.se> | 2023-01-31 09:36:07 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2023-01-31 15:03:19 +0100 |
commit | f1f8acb3b940327fcd7268404595cdcfc08185de (patch) | |
tree | 6b0b1aa3c13c26b2c87e07dd6501f4b2555358ce /lib/escape.c | |
parent | 1ca483a40cd5b9666a693259003582f13d42b6b0 (diff) | |
download | curl-f1f8acb3b940327fcd7268404595cdcfc08185de.tar.gz |
escape: hex decode with a lookup-table
Makes the decoding 2.8 times faster in my tests.
Closes #10376
Diffstat (limited to 'lib/escape.c')
-rw-r--r-- | lib/escape.c | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/lib/escape.c b/lib/escape.c index 1e1d7179e..93db06cbd 100644 --- a/lib/escape.c +++ b/lib/escape.c @@ -115,6 +115,16 @@ char *curl_easy_escape(struct Curl_easy *data, const char *string, return Curl_dyn_ptr(&d); } +static const unsigned char hextable[] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 - 0x3f */ + 0, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 - 0x4f */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 - 0x5f */ + 0, 10, 11, 12, 13, 14, 15 /* 0x60 - 0x66 */ +}; + +/* the input is a single hex digit */ +#define onehex2dec(x) hextable[x - '0'] + /* * Curl_urldecode() URL decodes the given string. * @@ -137,54 +147,47 @@ CURLcode Curl_urldecode(const char *string, size_t length, { size_t alloc; char *ns; - size_t strindex = 0; - unsigned long hex; DEBUGASSERT(string); DEBUGASSERT(ctrl >= REJECT_NADA); /* crash on TRUE/FALSE */ - alloc = (length?length:strlen(string)) + 1; - ns = malloc(alloc); + alloc = (length?length:strlen(string)); + ns = malloc(alloc + 1); if(!ns) return CURLE_OUT_OF_MEMORY; - while(--alloc > 0) { + /* store output string */ + *ostring = ns; + + while(alloc) { unsigned char in = *string; if(('%' == in) && (alloc > 2) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) { /* this is two hexadecimal digits following a '%' */ - char hexstr[3]; - char *ptr; - hexstr[0] = string[1]; - hexstr[1] = string[2]; - hexstr[2] = 0; - - hex = strtoul(hexstr, &ptr, 16); - - in = curlx_ultouc(hex); /* this long is never bigger than 255 anyway */ + in = (unsigned char)(onehex2dec(string[1]) << 4) | onehex2dec(string[2]); - string += 2; - alloc -= 2; + string += 3; + alloc -= 3; + } + else { + string++; + alloc--; } if(((ctrl == REJECT_CTRL) && (in < 0x20)) || ((ctrl == REJECT_ZERO) && (in == 0))) { - free(ns); + Curl_safefree(*ostring); return CURLE_URL_MALFORMAT; } - ns[strindex++] = in; - string++; + *ns++ = in; } - ns[strindex] = 0; /* terminate it */ + *ns = 0; /* terminate it */ if(olen) /* store output size */ - *olen = strindex; - - /* store output string */ - *ostring = ns; + *olen = ns - *ostring; return CURLE_OK; } |