fix #1427: [OSX] Process cmdline() and environ() may erroneously raise OSError on failed malloc().

2 files changed, 4 insertions, 2 deletions

diff --git a/HISTORY.rst b/HISTORY.rst
index b4f4888d..1f784706 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -12,6 +12,8 @@ XXXX-XX-XX
   in order to prevent that.
 - 1419_: [Windows] Process.environ() raises NotImplementedError when querying
   a 64-bit process in 32-bit-WoW mode. Now it raises AccessDenied.
+- 1427_: [OSX] Process cmdline() and environ() may erroneously raise OSError
+  on failed malloc().
 
 **Enhancements**
 
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;
     }