Skip to content

Get rid of borrowed references in getters #1182

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
asvetlov merged 1 commit into from
Jun 19, 2025
Merged

Get rid of borrowed references in getters #1182

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
34 changes: 26 additions & 8 deletions multidict/_multidict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,9 @@ static inline PyObject *
multidict_get(MultiDictObject *self, PyObject *const *args, Py_ssize_t nargs,
PyObject *kwnames)
{
PyObject *key = NULL, *_default = NULL, *ret;
PyObject *key = NULL;
PyObject *_default = NULL;
bool decref_default = false;

if (parse2("get",
args,
Expand All @@ -318,10 +320,17 @@ multidict_get(MultiDictObject *self, PyObject *const *args, Py_ssize_t nargs,
return NULL;
}
if (_default == NULL) {
// fixme, _default is potentially dangerous borrowed ref here
_default = Py_None;
_default = Py_GetConstant(Py_CONSTANT_NONE);
if (_default == NULL) {
return NULL;
}
decref_default = true;
}
ASSERT_CONSISTENT(self, false);
PyObject *ret = _multidict_getone(self, key, _default);
if (decref_default) {
Py_CLEAR(_default);
}
ret = _multidict_getone(self, key, _default);
return ret;
}

Expand Down Expand Up @@ -609,7 +618,9 @@ static PyObject *
multidict_setdefault(MultiDictObject *self, PyObject *const *args,
Py_ssize_t nargs, PyObject *kwnames)
{
PyObject *key = NULL, *_default = NULL;
PyObject *key = NULL;
PyObject *_default = NULL;
bool decref_default = false;

if (parse2("setdefault",
args,
Expand All @@ -623,11 +634,18 @@ multidict_setdefault(MultiDictObject *self, PyObject *const *args,
return NULL;
}
if (_default == NULL) {
// fixme, _default is potentially dangerous borrowed ref here
_default = Py_None;
_default = Py_GetConstant(Py_CONSTANT_NONE);
if (_default == NULL) {
return NULL;
}
decref_default = true;
}
ASSERT_CONSISTENT(self, false);
return md_set_default(self, key, _default);
PyObject *ret = md_set_default(self, key, _default);
if (decref_default) {
Py_CLEAR(_default);
}
return ret;
}

static PyObject *
Expand Down
Loading