Skip to content

Fix Calendar.ISO.parse_time negative zero offsets in basic format #15651

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
josevalim merged 1 commit into from
Jul 22, 2026
+20 −5
Merged

Fix Calendar.ISO.parse_time negative zero offsets in basic format #15651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/elixir/lib/calendar/iso.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2064,7 +2064,6 @@ defmodule Calendar.ISO do

defp parse_offset(""), do: {nil, ""}
defp parse_offset("Z"), do: {0, ""}
defp parse_offset("-00:00"), do: :error

defp parse_offset(<<?+, h1, h2, ?:, m1, m2, rest::binary>>),
do: parse_offset(1, h1, h2, m1, m2, rest)
Expand All @@ -2087,7 +2086,8 @@ defmodule Calendar.ISO do
true <- m1 in ?0..?5 and m2 in ?0..?9,
hour = (h1 - ?0) * 10 + h2 - ?0,
min = (m1 - ?0) * 10 + m2 - ?0,
true <- hour < 24 do
true <- hour < 24,
true <- sign == 1 or hour != 0 or min != 0 do
{(hour * 60 + min) * 60 * sign, rest}
else
_ -> :error
Expand Down
21 changes: 18 additions & 3 deletions lib/elixir/test/elixir/calendar/iso_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,12 @@ defmodule Calendar.ISOTest do
assert Calendar.ISO.parse_time("23:50:07Z") == {:ok, {23, 50, 7, {0, 0}}}
assert Calendar.ISO.parse_time("23:50:07+01:00") == {:ok, {23, 50, 7, {0, 0}}}

assert Calendar.ISO.parse_time("2015-01-23 23:50-00:00") == {:error, :invalid_format}
assert Calendar.ISO.parse_time("2015-01-23 23:50-00:60") == {:error, :invalid_format}
assert Calendar.ISO.parse_time("2015-01-23 23:50-24:00") == {:error, :invalid_format}
assert Calendar.ISO.parse_time("23:50:07-00:00") == {:error, :invalid_format}
assert Calendar.ISO.parse_time("23:50:07-0000") == {:error, :invalid_format}
assert Calendar.ISO.parse_time("23:50:07-00") == {:error, :invalid_format}

assert Calendar.ISO.parse_time("23:50:07-00:60") == {:error, :invalid_format}
assert Calendar.ISO.parse_time("23:50:07-24:00") == {:error, :invalid_format}
end

test "supports either comma or period millisecond delimiters" do
Expand Down Expand Up @@ -244,6 +247,12 @@ defmodule Calendar.ISOTest do
assert Calendar.ISO.parse_naive_datetime("2015-01-23T23:50:07.123-00:00") ==
{:error, :invalid_format}

assert Calendar.ISO.parse_naive_datetime("2015-01-23T23:50:07.123-0000") ==
{:error, :invalid_format}

assert Calendar.ISO.parse_naive_datetime("2015-01-23T23:50:07.123-00") ==
{:error, :invalid_format}

assert Calendar.ISO.parse_naive_datetime("2015-01-23T23:50:07.123-00:60") ==
{:error, :invalid_format}

Expand Down Expand Up @@ -321,6 +330,12 @@ defmodule Calendar.ISOTest do
assert Calendar.ISO.parse_utc_datetime("2015-01-23T23:50:07.123-00:00") ==
{:error, :invalid_format}

assert Calendar.ISO.parse_utc_datetime("2015-01-23T23:50:07.123-0000") ==
{:error, :invalid_format}

assert Calendar.ISO.parse_utc_datetime("2015-01-23T23:50:07.123-00") ==
{:error, :invalid_format}

assert Calendar.ISO.parse_utc_datetime("2015-01-23T23:50:07.123-00:60") ==
{:error, :invalid_format}

Expand Down
Loading