diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-08-01 16:45:25 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-08-01 16:45:25 +0200 |
| commit | 5ba055a8e514698058589d3b615d408767a6e330 (patch) | |
| tree | 3f9e76b3f851695d19d0101cc0bb48ecc25e17ff | |
| parent | 46723905330c4c37001e8c3a5cec22132eeded61 (diff) | |
| download | psutil-5ba055a8e514698058589d3b615d408767a6e330.tar.gz | |
#928: fix possible TypeError
| -rw-r--r-- | psutil/_psbsd.py | 12 | ||||
| -rw-r--r-- | psutil/_pssunos.py | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py index fe55f92f..ba2414cd 100644 --- a/psutil/_psbsd.py +++ b/psutil/_psbsd.py @@ -719,8 +719,10 @@ class Process(object): except KeyError: status = TCP_STATUSES[cext.PSUTIL_CONN_NONE] if fam in (AF_INET, AF_INET6): - laddr = _common.addr(*laddr) - raddr = _common.addr(*raddr) + if laddr: + laddr = _common.addr(*laddr) + if raddr: + raddr = _common.addr(*raddr) fam = sockfam_to_enum(fam) type = socktype_to_enum(type) nt = _common.pconn(fd, fam, type, laddr, raddr, status) @@ -737,8 +739,10 @@ class Process(object): for item in rawlist: fd, fam, type, laddr, raddr, status = item if fam in (AF_INET, AF_INET6): - laddr = _common.addr(*laddr) - raddr = _common.addr(*raddr) + if laddr: + laddr = _common.addr(*laddr) + if raddr: + raddr = _common.addr(*raddr) fam = sockfam_to_enum(fam) type = socktype_to_enum(type) status = TCP_STATUSES[status] diff --git a/psutil/_pssunos.py b/psutil/_pssunos.py index 9931d885..06e8bbba 100644 --- a/psutil/_pssunos.py +++ b/psutil/_pssunos.py @@ -266,8 +266,10 @@ def net_connections(kind, _pid=-1): if type_ not in types: continue if fam in (AF_INET, AF_INET6): - laddr = _common.addr(*laddr) - raddr = _common.addr(*raddr) + if laddr: + laddr = _common.addr(*laddr) + if raddr: + raddr = _common.addr(*raddr) status = TCP_STATUSES[status] fam = sockfam_to_enum(fam) type_ = socktype_to_enum(type_) |