mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

gh-116404: Handle errors correctly in wait_helper in posixmodule (#116405)

Browse source
This commit is contained in:
Nikita Sobolev 2024-03-06 11:46:47 +03:00 • committed by GitHub
parent d2f1b0eb49
commit 22ccf13b33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Modules/posixmodule.c
View file

@ -9577,36 +9577,39 @@ wait_helper(PyObject *module, pid_t pid, int status, struct rusage *ru)
if (!result) if (!result)
return NULL; return NULL;
int pos = 0;
#ifndef doubletime #ifndef doubletime
#define doubletime(TV) ((double)(TV).tv_sec + (TV).tv_usec * 0.000001) #define doubletime(TV) ((double)(TV).tv_sec + (TV).tv_usec * 0.000001)
#endif #endif
PyStructSequence_SET_ITEM(result, 0, #define SET_RESULT(CALL) \
PyFloat_FromDouble(doubletime(ru->ru_utime))); do { \
PyStructSequence_SET_ITEM(result, 1, PyObject *item = (CALL); \
PyFloat_FromDouble(doubletime(ru->ru_stime))); if (item == NULL) { \
#define SET_INT(result, index, value)\ Py_DECREF(result); \
PyStructSequence_SET_ITEM(result, index, PyLong_FromLong(value)) return NULL; \
SET_INT(result, 2, ru->ru_maxrss); } \
SET_INT(result, 3, ru->ru_ixrss); PyStructSequence_SET_ITEM(result, pos++, item); \
SET_INT(result, 4, ru->ru_idrss); } while(0)
SET_INT(result, 5, ru->ru_isrss);
SET_INT(result, 6, ru->ru_minflt);
SET_INT(result, 7, ru->ru_majflt);
SET_INT(result, 8, ru->ru_nswap);
SET_INT(result, 9, ru->ru_inblock);
SET_INT(result, 10, ru->ru_oublock);
SET_INT(result, 11, ru->ru_msgsnd);
SET_INT(result, 12, ru->ru_msgrcv);
SET_INT(result, 13, ru->ru_nsignals);
SET_INT(result, 14, ru->ru_nvcsw);
SET_INT(result, 15, ru->ru_nivcsw);
#undef SET_INT
if (PyErr_Occurred()) { SET_RESULT(PyFloat_FromDouble(doubletime(ru->ru_utime)));
Py_DECREF(result); SET_RESULT(PyFloat_FromDouble(doubletime(ru->ru_stime)));
return NULL; SET_RESULT(PyLong_FromLong(ru->ru_maxrss));
} SET_RESULT(PyLong_FromLong(ru->ru_ixrss));
SET_RESULT(PyLong_FromLong(ru->ru_idrss));
SET_RESULT(PyLong_FromLong(ru->ru_isrss));
SET_RESULT(PyLong_FromLong(ru->ru_minflt));
SET_RESULT(PyLong_FromLong(ru->ru_majflt));
SET_RESULT(PyLong_FromLong(ru->ru_nswap));
SET_RESULT(PyLong_FromLong(ru->ru_inblock));
SET_RESULT(PyLong_FromLong(ru->ru_oublock));
SET_RESULT(PyLong_FromLong(ru->ru_msgsnd));
SET_RESULT(PyLong_FromLong(ru->ru_msgrcv));
SET_RESULT(PyLong_FromLong(ru->ru_nsignals));
SET_RESULT(PyLong_FromLong(ru->ru_nvcsw));
SET_RESULT(PyLong_FromLong(ru->ru_nivcsw));
#undef SET_RESULT
return Py_BuildValue("NiN", PyLong_FromPid(pid), status, result); return Py_BuildValue("NiN", PyLong_FromPid(pid), status, result);
} }