summaryrefslogtreecommitdiff
path: root/psutil
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-02-24 14:06:47 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2019-02-24 14:06:47 +0100
commit2e239aa325aa25999be95b8bf2c59614aefe1bf9 (patch)
treef0df0a9a93d1115262acf8187103ce81616f3b4a /psutil
parent0a30dc9dc2693ffe9aa54126eb684711d950c3f1 (diff)
downloadpsutil-2e239aa325aa25999be95b8bf2c59614aefe1bf9.tar.gz
fix #1427: [OSX] Process cmdline() and environ() may erroneously raise OSError on failed malloc().
Diffstat (limited to 'psutil')
-rw-r--r--psutil/arch/osx/process_info.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/psutil/arch/osx/process_info.c b/psutil/arch/osx/process_info.c
index 40c79a2c..e5ecbaed 100644
--- a/psutil/arch/osx/process_info.c
+++ b/psutil/arch/osx/process_info.c
@@ -132,7 +132,7 @@ psutil_get_cmdline(long pid) {
procargs = (char *)malloc(argmax);
if (NULL == procargs) {
- PyErr_SetFromErrno(PyExc_OSError);
+ PyErr_NoMemory();
goto error;
}
@@ -226,7 +226,7 @@ psutil_get_environ(long pid) {
procargs = (char *)malloc(argmax);
if (NULL == procargs) {
- PyErr_SetFromErrno(PyExc_OSError);
+ PyErr_NoMemory();
goto error;
}