Skip to content

gh-152847: Reject POSIX TZ rule with non-digit day-of-year in _zoneinfo.py #152848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StanFromIreland merged 3 commits into from
Jul 2, 2026
+26 −0
Merged

gh-152847: Reject POSIX TZ rule with non-digit day-of-year in _zoneinfo.py #152848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f8955f
gh-152847: Reject non-digit day-of-year in pure-Python zoneinfo POSIX…
tonghuaroot Jul 2, 2026
76eebca
gh-152847: Trim the NEWS entry
tonghuaroot Jul 2, 2026
e8e43b5
Remove useless detail from comment
StanFromIreland Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions Lib/test/test_zoneinfo/test_zoneinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,9 @@ def test_extreme_tzstr(self):
"AAA4BBB,J1/2,J1/14",
"AAA4BBB,J20/2,J365/2",
"AAA4BBB,J365/2,J365/14",
# Leading-zero day-of-year
"AAA4BBB,J001/2,J065/2",
"AAA4BBB,001/2,065/2",
# Extreme transition hour
"AAA4BBB,J60/167,J300/2",
"AAA4BBB,J60/+167,J300/2",
Expand Down Expand Up @@ -1209,6 +1212,15 @@ def test_invalid_tzstr(self):
# Invalid julian offset
"AAA4BBB,J0/2,J20/2",
"AAA4BBB,J20/2,J366/2",
# gh-152847: non-digit day-of-year
"AAA4BBB,J1_0,J300/2",
"AAA4BBB,J60/2,J30_0/2",
"AAA4BBB,1_0,J300/2",
"AAA4BBB,J+1,J300/2",
"AAA4BBB,J 1,J300/2",
"AAA4BBB, 1,J300/2",
"AAA4BBB,J0001,J300/2",
"AAA4BBB,0001,J300/2",
# Invalid transition time
"AAA4BBB,J60/2/3,J300/2",
"AAA4BBB,J60/2,J300/2/3",
Expand Down Expand Up @@ -1248,6 +1260,15 @@ def test_invalid_tzstr_non_ascii_abbr(self):
with self.assertRaisesRegex(ValueError, expected):
self.zone_from_tzstr(tzstr, encoding="utf-8")

def test_invalid_tzstr_non_ascii_dst_date(self):
tzstr = "AAA4BBB,J١,J300/2"
if self.module is py_zoneinfo:
expected = re.escape(tzstr)
else:
expected = re.escape(repr(tzstr.encode("utf-8")))
with self.assertRaisesRegex(ValueError, expected):
self.zone_from_tzstr(tzstr, encoding="utf-8")

@classmethod
def _populate_test_cases(cls):
# This method uses a somewhat unusual style in that it populates the
Expand Down
2 changes: 2 additions & 0 deletions Lib/zoneinfo/_zoneinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,8 @@ def _parse_dst_start_end(dststr):
else:
n_is_julian = False

if re.fullmatch(r"\d{1,3}", date, re.ASCII) is None:
raise ValueError(f"Invalid dst start/end date: {dststr}")
doy = int(date)
offset = _DayOffset(doy, n_is_julian)

Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2026-07-02-12-00-00.gh-issue-152847.PitKqc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Reject a POSIX TZ transition rule with non-digit characters in the
day-of-year field in the pure-Python :mod:`zoneinfo` parser. Patch by
tonghuaroot.
Loading