wt/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2026-10-04 22:34:09 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add locale-independent ASCII classification helpers (Fix #2482, Fix #2483)

Browse Source 
std::isalnum and std::isdigit consult the global C locale, so a byte
like 0xC5 can classify as alphanumeric once an embedder calls
setlocale() (observed on macOS). HTTP grammars are defined over ASCII,
so raw bytes must be classified without regard to the locale.

Add detail::is_ascii_digit/is_ascii_alpha/is_ascii_alnum and use them
at every classification site: multipart boundary validation, token
checks, URI encoding, range header parsing, is_numeric, is_hex, and
IPv4 host detection. Also unify the hand-written digit range checks in
from_chars, URL parsing, and parse_ipv4 onto the same helpers.

With these in place nothing uses <cctype> anymore, so the include is
dropped.
This commit is contained in:
yhirose
2026-07-01 23:14:53 -04:00
parent 9a5321aadb
commit bd455f8b91
2 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test.cc
+25
View File
@@ -666,6 +666,31 @@ TEST(TrimTests, TrimStringTests) {
EXPECT_TRUE(detail::trim_copy("").empty());
}
TEST(AsciiTest, LocaleIndependentClassification) {
// detail::is_ascii_digit/alpha/alnum replace the <cctype> classifiers,
// which consult the global C locale: std::isalnum(0xC5) can return true
// once an embedder calls setlocale() (observed on macOS). The is_ascii_*
// helpers must classify every byte by the ASCII grammar alone.
for (int i = 0; i < 256; i++) {
auto c = static_cast<char>(i);
auto is_digit = i >= '0' && i <= '9';
auto is_upper = i >= 'A' && i <= 'Z';
auto is_lower = i >= 'a' && i <= 'z';
EXPECT_EQ(is_digit, detail::is_ascii_digit(c)) << "byte " << i;
EXPECT_EQ(is_upper || is_lower, detail::is_ascii_alpha(c)) << "byte " << i;
EXPECT_EQ(is_digit || is_upper || is_lower, detail::is_ascii_alnum(c))
<< "byte " << i;
}
// Regression check for the reported byte: 0xC5 is not alphanumeric.
EXPECT_FALSE(detail::is_ascii_alnum(static_cast<char>(0xC5)));
// Non-ASCII bytes must be percent-encoded, never passed through as
// alphanumeric.
EXPECT_EQ("%C5", httplib::encode_uri_component("\xC5"));
}
TEST(FromCharsTest, Double) {
// detail::from_chars(double) recognizes exactly the HTTP quality-value
// grammar (RFC 9110 12.4.2): a non-negative decimal "1*DIGIT [ '.' *DIGIT ]"