diff --git a/Python/ceval.c b/Python/ceval.c
index 42100393f60ff7..bce864a93a52d9 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1596,14 +1596,14 @@ initialize_locals(PyThreadState *tstate, PyFunctionObject *func,
continue;
PyObject *varname = PyTuple_GET_ITEM(co->co_localsplusnames, i);
if (func->func_kwdefaults != NULL) {
- PyObject *def = PyDict_GetItemWithError(func->func_kwdefaults, varname);
+ PyObject *def;
+ if (PyDict_GetItemRef(func->func_kwdefaults, varname, &def) < 0) {
+ goto fail_post_args;
+ }
if (def) {
- localsplus[i] = Py_NewRef(def);
+ localsplus[i] = def;
continue;
}
- else if (_PyErr_Occurred(tstate)) {
- goto fail_post_args;
- }
}
missing++;
}
@@ -2405,13 +2405,9 @@ PyEval_GetBuiltins(void)
PyObject *
_PyEval_GetBuiltin(PyObject *name)
{
- PyThreadState *tstate = _PyThreadState_GET();
- PyObject *attr = PyDict_GetItemWithError(PyEval_GetBuiltins(), name);
- if (attr) {
- Py_INCREF(attr);
- }
- else if (!_PyErr_Occurred(tstate)) {
- _PyErr_SetObject(tstate, PyExc_AttributeError, name);
+ PyObject *attr;
+ if (PyDict_GetItemRef(PyEval_GetBuiltins(), name, &attr) == 0) {
+ PyErr_SetObject(PyExc_AttributeError, name);
}
return attr;
}
@@ -2562,12 +2558,12 @@ static PyObject *
import_name(PyThreadState *tstate, _PyInterpreterFrame *frame,
PyObject *name, PyObject *fromlist, PyObject *level)
{
- PyObject *import_func = _PyDict_GetItemWithError(frame->f_builtins,
- &_Py_ID(__import__));
+ PyObject *import_func;
+ if (PyDict_GetItemRef(frame->f_builtins, &_Py_ID(__import__), &import_func) < 0) {
+ return NULL;
+ }
if (import_func == NULL) {
- if (!_PyErr_Occurred(tstate)) {
- _PyErr_SetString(tstate, PyExc_ImportError, "__import__ not found");
- }
+ _PyErr_SetString(tstate, PyExc_ImportError, "__import__ not found");
return NULL;
}
@@ -2578,6 +2574,7 @@ import_name(PyThreadState *tstate, _PyInterpreterFrame *frame,
/* Fast path for not overloaded __import__. */
if (_PyImport_IsDefaultImportFunc(tstate->interp, import_func)) {
+ Py_DECREF(import_func);
int ilevel = PyLong_AsInt(level);
if (ilevel == -1 && _PyErr_Occurred(tstate)) {
return NULL;
@@ -2591,7 +2588,6 @@ import_name(PyThreadState *tstate, _PyInterpreterFrame *frame,
}
PyObject* args[5] = {name, frame->f_globals, locals, fromlist, level};
- Py_INCREF(import_func);
PyObject *res = PyObject_Vectorcall(import_func, args, 5, NULL);
Py_DECREF(import_func);
return res;
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy