diff options
| author | Johannes Mueller <github@johannes-mueller.org> | 2017-07-05 00:46:27 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2017-07-08 18:12:46 +0200 |
| commit | 0af4d3e953357563b3407878b6949743111719a0 (patch) | |
| tree | 4aa0ffeeb6fb373c16637a3467c4da6b45536fb1 | |
| parent | 64d1ba371c690ab64f8435f545dc4528fc56f1d0 (diff) | |
| download | serd-0af4d3e953357563b3407878b6949743111719a0.tar.gz serd-0af4d3e953357563b3407878b6949743111719a0.tar.bz2 serd-0af4d3e953357563b3407878b6949743111719a0.zip | |
Fix parsing of hex escapes in file URIs
This fixes round-trip of paths to/from escaped file URIs.
| -rw-r--r-- | src/serd_internal.h | 7 | ||||
| -rw-r--r-- | src/uri.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/serd_internal.h b/src/serd_internal.h index aa5b3c53..afbea5fb 100644 --- a/src/serd_internal.h +++ b/src/serd_internal.h @@ -294,6 +294,13 @@ is_digit(const uint8_t c) return in_range(c, '0', '9'); } +/* RFC2234: HEXDIG ::= DIGIT / "A" / "B" / "C" / "D" / "E" / "F" */ +static inline bool +is_hexdig(const uint8_t c) +{ + return is_digit(c) || in_range(c, 'A', 'F'); +} + static inline bool is_space(const char c) { @@ -78,7 +78,7 @@ serd_file_uri_parse(const uint8_t* uri, uint8_t** hostname) if (*(s + 1) == '%') { serd_chunk_sink("%", 1, &chunk); ++s; - } else if (is_digit(*(s + 1)) && is_digit(*(s + 2))) { + } else if (is_hexdig(*(s + 1)) && is_hexdig(*(s + 2))) { const uint8_t code[3] = { *(s + 1), *(s + 2), 0 }; uint32_t num; sscanf((const char*)code, "%X", &num); |