From 0b992d2544eb4b6c1d8746a1af1bc258993aeb0b Mon Sep 17 00:00:00 2001 From: Siraj saheb Date: Sun, 25 Oct 2026 15:32:22 +0530 Subject: [PATCH] reject whitespace inside An+B numbers in parse_series --- cssselect/parser.py | 22 +++++++++++++++++++++- tests/test_cssselect.py | 11 +++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/cssselect/parser.py b/cssselect/parser.py index 35f0ffa..64d9612 100644 --- a/cssselect/parser.py +++ b/cssselect/parser.py @@ -929,13 +929,29 @@ def _parse_series_integer(s: str) -> int: return int(s) +# The B of An+B with whitespace: only around a sign that is a token of its +# own, as in "2n + 1" or "2n- 1". +_match_series_spaced_b = re.compile(" ?[+-] ?[0-9]+").fullmatch + + def parse_series(tokens: Iterable[Token]) -> tuple[int, int]: """Parses the arguments for :nth-child() and friends.""" + parts = [] + end = None for token in tokens: if token.type == "STRING": raise ValueError("String tokens not allowed in series.") + value = cast("str", token.value) + if end is not None and token.pos != end: + # Whitespace or a comment between two tokens, which must not + # join them: "1 2" is not "12". An escaped identifier is longer + # in the source than its value, but whitespace is allowed after + # the identifier that ends An anyway. + parts.append(" ") + parts.append(value) + end = token.pos + len(value) # The An+B microsyntax is ASCII-case-insensitive: 2N+1, EVEN, Odd... - s = ascii_lower("".join(cast("str", token.value) for token in tokens).strip()) + s = ascii_lower("".join(parts).strip()) if s == "odd": return 2, 1 if s == "even": @@ -953,6 +969,10 @@ def parse_series(tokens: Iterable[Token]) -> tuple[int, int]: a_as_int = int(a + "1") else: a_as_int = _parse_series_integer(a) + if " " in b: + if not _match_series_spaced_b(b): + raise ValueError(f"Invalid integer in series: {b!r}") + b = b.replace(" ", "") b_as_int = _parse_series_integer(b) if b else 0 return a_as_int, b_as_int diff --git a/tests/test_cssselect.py b/tests/test_cssselect.py index e98b5cb..fbe19fa 100644 --- a/tests/test_cssselect.py +++ b/tests/test_cssselect.py @@ -1357,6 +1357,17 @@ def series(css: str) -> tuple[int, int] | None: assert series("\u0662n+1") is None assert series("1_0") is None assert series("2n+1_0") is None + # Whitespace only around the sign of B, never inside a number. + assert series("-n- 3") == (-1, -3) + assert series("2\\6e +1") == (2, 1) + assert series("1 2") is None + assert series("+ 5") is None + assert series("2 n") is None + assert series("+ n+3") is None + assert series("- n+3") is None + assert series("2n 1") is None + assert series("2n + 1 0") is None + assert series("2n+1/**/0") is None def test_lang(self) -> None: document = etree.fromstring(XMLLANG_IDS)