Skip to content

_zoneinfo: reject empty quoted POSIX TZ abbreviations #9017

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
youknowone merged 2 commits into from
Oct 9, 2026
Merged

_zoneinfo: reject empty quoted POSIX TZ abbreviations #9017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f473bd6
Reject empty quoted POSIX timezone abbreviations
youknowdot Oct 9, 2026
1f6e983
Keep zoneinfo regression in module snippet
youknowdot Oct 9, 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
3 changes: 3 additions & 0 deletions crates/stdlib/src/_zoneinfo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,9 @@ mod _zoneinfo {
parser.bump();
}
let end = parser.i;
if end == start {
return None;
}
parser.bump();
return Some(String::from_utf8_lossy(&parser.bytes[start..end]).into_owned());
}
Expand Down
19 changes: 19 additions & 0 deletions extra_tests/snippets/stdlib_zoneinfo.py
View file
Open in desktop

@youknowone youknowone Oct 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rename to stdlib_zoneinfo.py

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import io
import struct
from zoneinfo import ZoneInfo

from testutils import assert_raises

# Minimal TZif v3 data with no transitions and a POSIX rule in the footer.
header = (b"TZif3" + b"\0" * 15 + struct.pack(">6l", 0, 0, 0, 0, 0, 0)) * 2


def zone_from_rule(rule):
return ZoneInfo.from_file(io.BytesIO(header + b"\n" + rule + b"\n"))


for rule in (b"<>5", b"AAA4<>,M3.2.0/2,M11.1.0/3"):
assert_raises(ValueError, zone_from_rule, rule)

# Quoting still permits nonempty numeric abbreviations.
assert zone_from_rule(b"<+05>-5").tzname(None) == "+05"
Loading