Skip to content

gh-111178: fix UBSan failures in Modules/_jsonmodule.c #129781

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 5 commits into from
Feb 17, 2025
Merged

gh-111178: fix UBSan failures in Modules/_jsonmodule.c #129781

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a94db65
fix UBSan failures for `json::PyScannerObject`
picnixz Jan 25, 2025
2f41394
fix UBSan failures for `json::PyEncoderObject`
picnixz Jan 25, 2025
ec3b018
Merge remote-tracking branch 'upstream/main' into fix/ubsan/json-111178
picnixz Feb 7, 2025
e199b8b
Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
271a75c
Merge branch 'main' into fix/ubsan/json-111178
encukou Feb 17, 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 json::PyScannerObject
  • Loading branch information
@picnixz
picnixz committed Jan 25, 2025
commit a94db65556df426473e06a95bae925c5c4ff3f5a
19 changes: 13 additions & 6 deletions Modules/_json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ typedef struct _PyScannerObject {
PyObject *parse_constant;
} PyScannerObject;

#define _PyScannerObject_CAST(op) ((PyScannerObject *)(op))

static PyMemberDef scanner_members[] = {
{"strict", Py_T_BOOL, offsetof(PyScannerObject, strict), Py_READONLY, "strict"},
{"object_hook", _Py_T_OBJECT, offsetof(PyScannerObject, object_hook), Py_READONLY, "object_hook"},
Expand Down Expand Up @@ -69,6 +71,7 @@ static PyObject *
ascii_escape_unicode(PyObject *pystr);
static PyObject *
py_encode_basestring_ascii(PyObject* Py_UNUSED(self), PyObject *pystr);

static PyObject *
scan_once_unicode(PyScannerObject *s, PyObject *memo, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr);
static PyObject *
Expand All @@ -78,7 +81,8 @@ scanner_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
static void
scanner_dealloc(PyObject *self);
static int
scanner_clear(PyScannerObject *self);
scanner_clear(PyObject *self);

static PyObject *
encoder_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
static void
Expand Down Expand Up @@ -617,14 +621,15 @@ scanner_dealloc(PyObject *self)
PyTypeObject *tp = Py_TYPE(self);
/* bpo-31095: UnTrack is needed before calling any callbacks */
PyObject_GC_UnTrack(self);
scanner_clear((PyScannerObject *)self);
(void)scanner_clear(self);
tp->tp_free(self);
Py_DECREF(tp);
}

static int
scanner_traverse(PyScannerObject *self, visitproc visit, void *arg)
scanner_traverse(PyObject *op, visitproc visit, void *arg)
{
PyScannerObject *self = _PyScannerObject_CAST(op);
Py_VISIT(Py_TYPE(self));
Py_VISIT(self->object_hook);
Py_VISIT(self->object_pairs_hook);
Expand All @@ -635,8 +640,9 @@ scanner_traverse(PyScannerObject *self, visitproc visit, void *arg)
}

static int
scanner_clear(PyScannerObject *self)
scanner_clear(PyObject *op)
{
PyScannerObject *self = _PyScannerObject_CAST(op);
Py_CLEAR(self->object_hook);
Py_CLEAR(self->object_pairs_hook);
Py_CLEAR(self->parse_float);
Expand Down Expand Up @@ -1106,7 +1112,7 @@ scan_once_unicode(PyScannerObject *s, PyObject *memo, PyObject *pystr, Py_ssize_
}

static PyObject *
scanner_call(PyScannerObject *self, PyObject *args, PyObject *kwds)
scanner_call(PyObject *self, PyObject *args, PyObject *kwds)
{
/* Python callable interface to scan_once_{str,unicode} */
PyObject *pystr;
Expand All @@ -1128,7 +1134,8 @@ scanner_call(PyScannerObject *self, PyObject *args, PyObject *kwds)
if (memo == NULL) {
return NULL;
}
rval = scan_once_unicode(self, memo, pystr, idx, &next_idx);
rval = scan_once_unicode(_PyScannerObject_CAST(self),
memo, pystr, idx, &next_idx);
Py_DECREF(memo);
if (rval == NULL)
return NULL;
Expand Down