8000 gh-129354: Use PyErr_FormatUnraisable() function by vstinner · Pull Request #129511 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-129354: Use PyErr_FormatUnraisable() function #129511

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
merged 1 commit into from
Jan 31, 2025
Merged

gh-129354: Use PyErr_FormatUnraisable() function #129511

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions Modules/_ctypes/_ctypes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,8 @@ CType_Type_traverse(PyObject *self, visitproc visit, void *arg)
{
StgInfo *info = _PyStgInfo_FromType_NoState(self);
if (!info) {
PyErr_WriteUnraisable(self);
PyErr_FormatUnraisable("Exception ignored while "
"calling ctypes traverse function %R", self);
}
if (info) {
Py_VISIT(info->proto);
Expand Down Expand Up @@ -495,7 +496,8 @@ CType_Type_clear(PyObject *self)
{
StgInfo *info = _PyStgInfo_FromType_NoState(self);
if (!info) {
PyErr_WriteUnraisable(self);
PyErr_FormatUnraisable("Exception ignored while "
"clearing ctypes %R", self);
}
if (info) {
ctype_clear_stginfo(info);
Expand All @@ -508,7 +510,8 @@ CType_Type_dealloc(PyObject *self)
{
StgInfo *info = _PyStgInfo_FromType_NoState(self);
if (!info) {
PyErr_WriteUnraisable(NULL); // NULL avoids segfault here
PyErr_FormatUnraisable("Exception ignored while "
"deallocating ctypes %R", self);
}
if (info) {
PyMem_Free(info->ffi_type_pointer.elements);
Expand Down
47 changes: 21 additions & 26 deletions Modules/_ctypes/callbacks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,39 +487,31 @@ long Call_GetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{
PyObject *func, *result;
long retval;
static PyObject *context;

if (context == NULL)
context = PyUnicode_InternFromString("_ctypes.DllGetClassObject");

func = PyImport_ImportModuleAttrString("ctypes", "DllGetClassObject");
if (!func) {
PyErr_WriteUnraisable(context ? context : Py_None);
/* There has been a warning before about this already */
8000 return E_FAIL;
goto error;
}

{
PyObject *py_rclsid = PyLong_FromVoidPtr((void *)rclsid);
if (py_rclsid == NULL) {
Py_DECREF(func);
PyErr_WriteUnraisable(context ? context : Py_None);
return E_FAIL;
goto error;
}
PyObject *py_riid = PyLong_FromVoidPtr((void *)riid);
if (py_riid == NULL) {
Py_DECREF(func);
Py_DECREF(py_rclsid);
PyErr_WriteUnraisable(context ? context : Py_None);
return E_FAIL;
goto error;
}
PyObject *py_ppv = PyLong_FromVoidPtr(ppv);
if (py_ppv == NULL) {
Py_DECREF(py_rclsid);
Py_DECREF(py_riid);
Py_DECREF(func);
PyErr_WriteUnraisable(context ? context : Py_None);
return E_FAIL;
goto error;
}
result = PyObject_CallFunctionObjArgs(func,
py_rclsid,
Expand All @@ -532,17 +524,21 @@ long Call_GetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
}
Py_DECREF(func);
if (!result) {
PyErr_WriteUnraisable(context ? context : Py_None);
return E_FAIL;
goto error;
}

retval = PyLong_AsLong(result);
if (PyErr_Occurred()) {
PyErr_WriteUnraisable(context ? context : Py_None);
retval = E_FAIL;
Py_DECREF(result);
goto error;
}
Py_DECREF(result);
return retval;

error:
PyErr_FormatUnraisable("Exception ignored while calling "
"ctypes.DllGetClassObject");
return E_FAIL;
}

STDAPI DllGetClassObject(REFCLSID rclsid,
Expand All @@ -563,10 +559,6 @@ long Call_CanUnloadNow(void)
{
PyObject *mod, *func, *result;
long retval;
static PyObject *context;

if (context == NULL)
context = PyUnicode_InternFromString("_ctypes.DllCanUnloadNow");

mod = PyImport_ImportModule("ctypes");
if (!mod) {
Expand All @@ -580,24 +572,27 @@ long Call_CanUnloadNow(void)
func = PyObject_GetAttrString(mod, "DllCanUnloadNow");
Py_DECREF(mod);
if (!func) {
PyErr_WriteUnraisable(context ? context : Py_None);
return E_FAIL;
goto error;
}

result = _PyObject_CallNoArgs(func);
Py_DECREF(func);
if (!result) {
PyErr_WriteUnraisable(context ? context : Py_None);
return E_FAIL;
goto error;
}

retval = PyLong_AsLong(result);
if (PyErr_Occurred()) {
PyErr_WriteUnraisable(context ? context : Py_None);
retval = E_FAIL;
Py_DECREF(result);
goto error;
}
Py_DECREF(result);
return retval;

error:
PyErr_FormatUnraisable("Exception ignored while calling "
"ctypes.DllCanUnloadNow");
return E_FAIL;
}

/*
Expand Down
6 changes: 4 additions & 2 deletions Modules/_lsprof.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ static PyTime_t CallExternalTimer(ProfilerObject *pObj)
pObj->flags &= ~POF_EXT_TIMER;

if (o == NULL) {
PyErr_WriteUnraisable(pObj->externalTimer);
PyErr_FormatUnraisable("Exception ignored while calling "
"_lsprof timer %R", pObj->externalTimer);
return 0;
}

Expand All @@ -116,7 +117,8 @@ static PyTime_t CallExternalTimer(ProfilerObject *pObj)
}
Py_DECREF(o);
if (err < 0) {
PyErr_WriteUnraisable(pObj->externalTimer);
PyErr_FormatUnraisable("Exception ignored while calling "
"_lsprof timer %R", pObj->externalTimer);
return 0;
}
return result;
Expand Down
4 changes: 3 additions & 1 deletion Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1735,7 +1735,9 @@ unicode_dealloc(PyObject *unicode)
PyObject *popped;
int r = PyDict_Pop(interned, unicode, &popped);
if (r == -1) {
PyErr_WriteUnraisable(unicode);
PyErr_FormatUnraisable("Exception ignored while "
"removing an interned string %R",
unicode);
// We don't know what happened to the string. It's probably
// best to leak it:
// - if it was popped, there are no more references to it
Expand Down
9 changes: 6 additions & 3 deletions Objects/weakrefobject.c
6D40
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,10 +987,13 @@ handle_callback(PyWeakReference *ref, PyObject *callback)
{
PyObject *cbresult = PyObject_CallOneArg(callback, (PyObject *)ref);

if (cbresult == NULL)
PyErr_WriteUnraisable(callback);
else
if (cbresult == NULL) {
PyErr_FormatUnraisable("Exception ignored while "
"calling weakref callback %R", callback);
}
else {
Py_DECREF(cbresult);
}
}

/* This function is called by the tp_dealloc handler to clear weak references.
Expand Down
Loading
0