Skip to content

Fix timezone sanity check for platforms with unsigned time_t #123277

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

Closed
wants to merge 1 commit into from
Closed

Fix timezone sanity check for platforms with unsigned time_t #123277

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
9 changes: 5 additions & 4 deletions Modules/timemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,17 +1808,18 @@ init_timezone(PyObject *m)
julyzone_t = -get_gmtoff(t, &p);
julyname[9] = '\0';

int janzone = (int)janzone_t;
Copy link
Member

Choose a reason for hiding this comment

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

You should add a comment explaining this cast: mention unsigned time_t, maybe QNX, and the issue number.

I would feel more comfortable with int64_t type instead of int.

int julyzone = (int)julyzone_t;

/* Sanity check, don't check for the validity of timezones.
In practice, it should be more in range -12 hours .. +14 hours. */
#define MAX_TIMEZONE (48 * 3600)
if (janzone_t < -MAX_TIMEZONE || janzone_t > MAX_TIMEZONE
|| julyzone_t < -MAX_TIMEZONE || julyzone_t > MAX_TIMEZONE)
if (janzone < -MAX_TIMEZONE || janzone > MAX_TIMEZONE
|| julyzone < -MAX_TIMEZONE || julyzone > MAX_TIMEZONE)
{
PyErr_SetString(PyExc_RuntimeError, "invalid GMT offset");
return -1;
}
int janzone = (int)janzone_t;
int julyzone = (int)julyzone_t;

PyObject *tzname_obj;
if (janzone < julyzone) {
Expand Down
Loading