diff options
| author | Antoine Pitrou <pitrou@free.fr> | 2017-05-02 15:20:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 15:20:00 (GMT) |
| commit | 495b5021e73e3c4b6404417ecf4fa83aa10297f0 (patch) | |
| tree | 74eebc9c19415d534342984ed3fe25f22a194f3e | |
| parent | b0d82036549074357717d130a772d1e2ebc8ea01 (diff) | |
| download | cpython-495b5021e73e3c4b6404417ecf4fa83aa10297f0.zip cpython-495b5021e73e3c4b6404417ecf4fa83aa10297f0.tar.gz cpython-495b5021e73e3c4b6404417ecf4fa83aa10297f0.tar.bz2 | |
bpo-30205: Fix getsockname() for unbound AF_UNIX sockets on Linux (#1370)
* bpo-30205: Fix getsockname() for unbound AF_UNIX sockets on Linux
* Add NEWS entry
| -rw-r--r-- | Lib/test/test_socket.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 2155d63..5e37fc6 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -4682,6 +4682,10 @@ class TestUnixDomain(unittest.TestCase): else: raise + def testUnbound(self): + # Issue #30205 + self.assertEqual(self.sock.getsockname(), '') + def testStrAddr(self): # Test binding to and retrieving a normal string pathname. path = os.path.abspath(support.TESTFN) @@ -317,6 +317,8 @@ Extension Modules Library ------- +- bpo-30205: Fix getsockname() for unbound AF_UNIX sockets on Linux. + - bpo-30228: The seek() and tell() methods of io.FileIO now set the internal seekable attribute to avoid one syscall on open() (in buffered or text mode). diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 6d5c256..456c664 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1211,9 +1211,9 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto) { 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 */ |