Skip to content

gh-111178: fix UBSan failures in Modules/_zoneinfo.c #129798

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
encukou merged 7 commits into from
Feb 26, 2025
Merged

gh-111178: fix UBSan failures in Modules/_zoneinfo.c #129798

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
57237cf
fix UBSan failures for `PyZoneInfo_ZoneInfo`
picnixz Jan 25, 2025
8c2d236
Merge remote-tracking branch 'upstream/main' into fix/ubsan/zoneinfo-…
picnixz Feb 7, 2025
832a702
Do Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
d97c2fd
Merge branch 'main' into fix/ubsan/zoneinfo-111178
encukou Feb 21, 2025
29f6979
remove `PyZoneInfo_ZoneInfo_FAST_CAST` macro
picnixz Feb 25, 2025
d949061
reduce diff
picnixz Feb 25, 2025
9447bb4
fix semantic naming
picnixz Feb 25, 2025
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
Prev Previous commit
Next Next commit
remove PyZoneInfo_ZoneInfo_FAST_CAST macro 
Raw casts were restored when they could be left as is
  • Loading branch information
@picnixz
picnixz committed Feb 25, 2025
commit 29f69792207b997c5ac0d8bc355ec4018d37f0d1
17 changes: 8 additions & 9 deletions Modules/_zoneinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ typedef struct {
unsigned char source;
} PyZoneInfo_ZoneInfo;

#define PyZoneInfo_ZoneInfo_FAST_CAST(op) ((PyZoneInfo_ZoneInfo *)(op))
#define PyZoneInfo_ZoneInfo_CAST(op) PyZoneInfo_ZoneInfo_FAST_CAST(op)
#define PyZoneInfo_ZoneInfo_CAST(op) ((PyZoneInfo_ZoneInfo *)(op))

struct TransitionRuleType {
int64_t (*year_to_timestamp)(TransitionRuleType *, int);
Expand Down Expand Up @@ -254,7 +253,8 @@ zoneinfo_new_instance(zoneinfo_state *state, PyTypeObject *type, PyObject *key)
}
}

if (load_data(state, PyZoneInfo_ZoneInfo_FAST_CAST(self), file_obj)) {
PyZoneInfo_ZoneInfo *self_zinfo = (PyZoneInfo_ZoneInfo *)self;
if (load_data(state, self_zinfo, file_obj)) {
goto error;
}

Expand All @@ -265,7 +265,7 @@ zoneinfo_new_instance(zoneinfo_state *state, PyTypeObject *type, PyObject *key)
}
Py_DECREF(rv);

PyZoneInfo_ZoneInfo_FAST_CAST(self)->key = Py_NewRef(key);
self_zinfo->key = Py_NewRef(key);

goto cleanup;
error:
Expand Down Expand Up @@ -341,7 +341,7 @@ zoneinfo_ZoneInfo_impl(PyTypeObject *type, PyObject *key)
if (instance == NULL) {
return NULL;
}
PyZoneInfo_ZoneInfo_FAST_CAST(instance)->source = SOURCE_CACHE;
((PyZoneInfo_ZoneInfo *)(instance))->source = SOURCE_CACHE;
}

update_strong_cache(state, type, key, instance);
Expand Down Expand Up @@ -425,11 +425,10 @@ zoneinfo_ZoneInfo_from_file_impl(PyTypeObject *type, PyTypeObject *cls,
PyObject *file_repr = NULL;
PyZoneInfo_ZoneInfo *self = NULL;

PyObject *obj_self = type->tp_alloc(type, 0);
if (obj_self == NULL) {
self = (PyZoneInfo_ZoneInfo *)type->tp_alloc(type, 0);
if (self == NULL) {
return NULL;
}
self = PyZoneInfo_ZoneInfo_FAST_CAST(obj_self);

file_repr = PyObject_Repr(file_obj);
if (file_repr == NULL) {
Expand All @@ -444,7 +443,7 @@ zoneinfo_ZoneInfo_from_file_impl(PyTypeObject *type, PyTypeObject *cls,
self->source = SOURCE_FILE;
self->file_repr = file_repr;
self->key = Py_NewRef(key);
return obj_self;
return (PyObject *)self;

error:
Py_XDECREF(file_repr);
Expand Down