commit 0c2ff0898db2db9cd9c643dfadbff11761bacf5f
author Antoine Pitrou <pitrou@free.fr> Wed May 03 00:14:29 2017 +0200
committer GitHub <noreply@github.com> Wed May 03 00:14:29 2017 +0200
tree 088ce426f1f31178b6a3e1c7f1db78b3074c9bb3
parent 4dae0d111dd7bb34ec730eea2327a3219acff211

Backport bpo-30205 to 3.6 (#1403)

Modules/socketmodule.c

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index f3654c9..42aec59 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1212,9 +1212,9 @@
     {
         struct sockaddr_un *a = (struct sockaddr_un *) addr;
 #ifdef __linux__
-        if (a->sun_path[0] == 0) {  /* Linux abstract namespace */
-            addrlen -= offsetof(struct sockaddr_un, sun_path);
-            return PyBytes_FromStringAndSize(a->sun_path, addrlen);
+        size_t linuxaddrlen = addrlen - offsetof(struct sockaddr_un, sun_path);
+        if (linuxaddrlen > 0 && a->sun_path[0] == 0) {  /* Linux abstract namespace */
+            return PyBytes_FromStringAndSize(a->sun_path, linuxaddrlen);
         }
         else
 #endif /* linux */