@@ -165,6 +165,9 @@ enum url_cb_args {
165
165
// https://infra.spec.whatwg.org/#ascii-tab-or-newline
166
166
CHAR_TEST (8 , IsASCIITabOrNewline, (ch == ' \t ' || ch == ' \n ' || ch == ' \r ' ))
167
167
168
+ // https://infra.spec.whatwg.org/#c0-control
169
+ CHAR_TEST (8 , IsC0Control, (ch >= ' \0 ' && ch <= ' \x1f ' ))
170
+
168
171
// https://infra.spec.whatwg.org/#c0-control-or-space
169
172
CHAR_TEST (8 , IsC0ControlOrSpace, (ch >= ' \0 ' && ch <= ' ' ))
170
173
@@ -192,10 +195,14 @@ T ASCIILowercase(T ch) {
192
195
// https://url.spec.whatwg.org/#forbidden-host-code-point
193
196
CHAR_TEST (8 , IsForbiddenHostCodePoint,
194
197
ch == ' \0 ' || ch == ' \t ' || ch == ' \n ' || ch == ' \r ' ||
195
- ch == ' ' || ch == ' #' || ch == ' %' || ch == ' /' ||
196
- ch == ' :' || ch == ' ?' || ch == ' @' || ch == ' [' ||
197
- ch == ' <' || ch == ' >' || ch == ' \\ ' || ch == ' ]' ||
198
- ch == ' ^' || ch == ' |' )
198
+ ch == ' ' || ch == ' #' || ch == ' /' || ch == ' :' ||
199
+ ch == ' ?' || ch == ' @' || ch == ' [' || ch == ' <' ||
200
+ ch == ' >' || ch == ' \\ ' || ch == ' ]' || ch == ' ^' ||
201
+ ch == ' |' )
202
+
203
+ // https://url.spec.whatwg.org/#forbidden-domain-code-point
204
+ CHAR_TEST (8 , IsForbiddenDomainCodePoint,
205
+ (IsForbiddenHostCodePoint(ch) || IsC0Control(ch) || ch == ' %' || ch == ' \x7f ' ))
199
206
200
207
// https://url.spec.whatwg.org/#windows-drive-letter
201
208
TWO_CHAR_STRING_TEST (8 , IsWindowsDriveLetter,
@@ -457,7 +464,7 @@ void URLHost::ParseOpaqueHost(const char* input, size_t length) {
457
464
output.reserve (length);
458
465
for (size_t i = 0 ; i < length; i++) {
459
466
const char ch = input[i];
460
- if (ch != ' % ' && IsForbiddenHostCodePoint (ch)) {
467
+ if (IsForbiddenHostCodePoint (ch)) {
461
468
return ;
462
469
} else {
463
470
AppendOrEscape (&output, ch, C0_CONTROL_ENCODE_SET);
@@ -496,7 +503,7 @@ void URLHost::ParseHost(const char* input,
496
503
// If any of the following characters are still present, we have to fail
497
504
for (size_t n = 0 ; n < decoded.size (); n++) {
498
505
const char ch = decoded[n];
499
- if (IsForbiddenHostCodePoint (ch)) {
506
+ if (IsForbiddenDomainCodePoint (ch)) {
500
507
return ;
501
508
}
502
509
}
0 commit comments