Skip to content

gh-111178: fix UBSan failures in Modules/_sre/sre.c #128250

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 4 commits into from
Jan 7, 2025
Merged

gh-111178: fix UBSan failures in Modules/_sre/sre.c #128250

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7539a9d
fix UBSan failures for `PatternObject`
picnixz Dec 23, 2024
b54445a
fix UBSan failures for `MatchObject`
picnixz Dec 23, 2024
befaf15
fix UBSan failures for `TemplateObject`
picnixz Dec 23, 2024
9101971
fix UBSan failures for `ScannerObject`
picnixz Dec 23, 2024
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
fix UBSan failures for MatchObject
  • Loading branch information
@picnixz
picnixz committed Dec 23, 2024
commit b54445a57c7177e5b2923005963cd63d6a5b88ee
33 changes: 20 additions & 13 deletions Modules/_sre/sre.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ static PyObject*pattern_new_match(_sremodulestate *, PatternObject*, SRE_STATE*,
static PyObject *pattern_scanner(_sremodulestate *, PatternObject *, PyObject *, Py_ssize_t, Py_ssize_t);

#define _PatternObject_CAST(op) ((PatternObject *)(op))
#define _MatchObject_CAST(op) ((MatchObject *)(op))

/*[clinic input]
module _sre
Expand Down Expand Up @@ -2252,8 +2253,9 @@ _validate(PatternObject *self)
/* match methods */

static int
match_traverse(MatchObject *self, visitproc visit, void *arg)
match_traverse(PyObject *op, visitproc visit, void *arg)
{
MatchObject *self = _MatchObject_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->string);
Py_VISIT(self->regs);
Expand All @@ -2262,19 +2264,19 @@ match_traverse(MatchObject *self, visitproc visit, void *arg)
}

static int
match_clear(MatchObject *self)
match_clear(PyObject *op)
{
MatchObject *self = _MatchObject_CAST(op);
Py_CLEAR(self->string);
Py_CLEAR(self->regs);
Py_CLEAR(self->pattern);
return 0;
}

static void
match_dealloc(MatchObject* self)
match_dealloc(PyObject *self)
{
PyTypeObject *tp = Py_TYPE(self);

PyObject_GC_UnTrack(self);
(void)match_clear(self);
tp->tp_free(self);
Expand Down Expand Up @@ -2383,8 +2385,9 @@ _sre_SRE_Match_expand_impl(MatchObject *self, PyObject *template)
}

static PyObject*
match_group(MatchObject* self, PyObject* args)
match_group(PyObject *op, PyObject* args)
{
MatchObject *self = _MatchObject_CAST(op);
PyObject* result;
Py_ssize_t i, size;

Expand Down Expand Up @@ -2418,8 +2421,9 @@ match_group(MatchObject* self, PyObject* args)
}

static PyObject*
match_getitem(MatchObject* self, PyObject* name)
match_getitem(PyObject *op, PyObject* name)
{
MatchObject *self = _MatchObject_CAST(op);
return match_getslice(self, name, Py_None);
}

Expand Down Expand Up @@ -2661,16 +2665,18 @@ PyDoc_STRVAR(match_group_doc,
For 0 returns the entire match.");

static PyObject *
match_lastindex_get(MatchObject *self, void *Py_UNUSED(ignored))
match_lastindex_get(PyObject *op, void *Py_UNUSED(ignored))
{
MatchObject *self = _MatchObject_CAST(op);
if (self->lastindex >= 0)
return PyLong_FromSsize_t(self->lastindex);
Py_RETURN_NONE;
}

static PyObject *
match_lastgroup_get(MatchObject *self, void *Py_UNUSED(ignored))
match_lastgroup_get(PyObject *op, void *Py_UNUSED(ignored))
{
MatchObject *self = _MatchObject_CAST(op);
if (self->pattern->indexgroup &&
self->lastindex >= 0 &&
self->lastindex < PyTuple_GET_SIZE(self->pattern->indexgroup))
Expand All @@ -2683,8 +2689,9 @@ match_lastgroup_get(MatchObject *self, void *Py_UNUSED(ignored))
}

static PyObject *
match_regs_get(MatchObject *self, void *Py_UNUSED(ignored))
match_regs_get(PyObject *op, void *Py_UNUSED(ignored))
{
MatchObject *self = _MatchObject_CAST(op);
if (self->regs) {
return Py_NewRef(self->regs);
} else
Expand Down Expand Up @@ -3198,7 +3205,7 @@ static PyType_Spec pattern_spec = {
};

static PyMethodDef match_methods[] = {
{"group", (PyCFunction) match_group, METH_VARARGS, match_group_doc},
{"group", match_group, METH_VARARGS, match_group_doc},
_SRE_SRE_MATCH_START_METHODDEF
_SRE_SRE_MATCH_END_METHODDEF
_SRE_SRE_MATCH_SPAN_METHODDEF
Expand All @@ -3213,11 +3220,11 @@ static PyMethodDef match_methods[] = {
};

static PyGetSetDef match_getset[] = {
{"lastindex", (getter)match_lastindex_get, (setter)NULL,
{"lastindex", match_lastindex_get, NULL,
"The integer index of the last matched capturing group."},
{"lastgroup", (getter)match_lastgroup_get, (setter)NULL,
{"lastgroup", match_lastgroup_get, NULL,
"The name of the last matched capturing group."},
{"regs", (getter)match_regs_get, (setter)NULL},
{"regs", match_regs_get, NULL, NULL},
{NULL}
};

Expand Down