Skip to content

gh-111178: fix UBSan failures in Modules/unicodedata.c #129801

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 2 commits into from
Feb 25, 2025
Merged

gh-111178: fix UBSan failures in Modules/unicodedata.c #129801

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
648b517
fix UBSan failures for `PreviousDBVersion`
picnixz Feb 6, 2025
8364c07
Merge remote-tracking branch 'upstream/main' into fix/ubsan/unicodeda…
picnixz Feb 7, 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
Next Next commit
fix UBSan failures for PreviousDBVersion
  • Loading branch information
@picnixz
picnixz committed Feb 6, 2025
commit 648b5171e612ed3cd187a7ce071e9120cce17728
8 changes: 5 additions & 3 deletions Modules/unicodedata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@ typedef struct previous_version {
Py_UCS4 (*normalization)(Py_UCS4);
} PreviousDBVersion;

#define PreviousDBVersion_CAST(op) ((PreviousDBVersion *)(op))

#include "clinic/unicodedata.c.h"

#define get_old_record(self, v) ((((PreviousDBVersion*)self)->getrecord)(v))
#define get_old_record(self, v) (PreviousDBVersion_CAST(self)->getrecord(v))

static PyMemberDef DB_members[] = {
{"unidata_version", Py_T_STRING, offsetof(PreviousDBVersion, name), Py_READONLY},
Expand Down Expand Up @@ -1591,14 +1593,14 @@ static PyMethodDef unicodedata_functions[] = {
};

static int
ucd_traverse(PreviousDBVersion *self, visitproc visit, void *arg)
ucd_traverse(PyObject *self, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(self));
return 0;
}

static void
ucd_dealloc(PreviousDBVersion *self)
ucd_dealloc(PyObject *self)
{
PyTypeObject *tp = Py_TYPE(self);
PyObject_GC_UnTrack(self);
Expand Down