#928: fix possible TypeError

giampaolo · Aug 1, 2017 · 5ba055a · 5ba055a
1 parent 4672390
commit 5ba055a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/psutil/_psbsd.py b/psutil/_psbsd.py
@@ -719,8 +719,10 @@ def connections(self, kind='inet'):
                     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 @@ def connections(self, kind='inet'):
         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
@@ -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_)