diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-13 22:42:56 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-13 22:42:56 +0200 |
| commit | 25da29a247db8d8296781890b592738c61fa337c (patch) | |
| tree | 47994614d4b33d511d393f57fa2013b49f11f1ab | |
| parent | b7ea5a38a3f09f1dceacf05a8cbc82562db84aa4 (diff) | |
| parent | 90df05ccc3800cab3e5e313567237610b23761a1 (diff) | |
| download | psutil-930-netbsd-connections-segfault.tar.gz | |
Merge branch 'master' into 930-netbsd-connections-segfault930-netbsd-connections-segfault
| -rw-r--r-- | HISTORY.rst | 2 | ||||
| -rw-r--r-- | psutil/arch/bsd/openbsd.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index ee18f0e0..a80d1123 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -52,7 +52,7 @@ - 1063_: [NetBSD] net_connections() may list incorrect sockets. - 1064_: [NetBSD] swap_memory() may segfault in case of error. - 1065_: [OpenBSD] Process.cmdline() may raise SystemError. -- 1067_: [NetBSD] Process.cmdline() memory leak. +- 1067_: [NetBSD] Process.cmdline() leaks memory if proces has terminated. **Porting notes** diff --git a/psutil/arch/bsd/openbsd.c b/psutil/arch/bsd/openbsd.c index 75679cf2..4caf6ed5 100644 --- a/psutil/arch/bsd/openbsd.c +++ b/psutil/arch/bsd/openbsd.c @@ -102,6 +102,7 @@ kinfo_getfile(long pid, int* cnt) { } mib[5] = (int)(len / sizeof(struct kinfo_file)); if (sysctl(mib, 6, kf, &len, NULL, 0) < 0) { + free(kf); PyErr_SetFromErrno(PyExc_OSError); return NULL; } |