diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-29 10:11:46 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-29 10:11:46 +0000 |
| commit | bf043491a10e65706c0305050de86c91ab2fae62 (patch) | |
| tree | 1bdc54bebeb000c3fa85bf53de714f9acb8f0018 | |
| parent | 764b8780db08cf02891b2d7bdce920ae167f8188 (diff) | |
| download | cpython-git-bf043491a10e65706c0305050de86c91ab2fae62.tar.gz | |
Merged revisions 80610 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80610 | antoine.pitrou | 2010-04-29 12:05:40 +0200 (jeu., 29 avril 2010) | 4 lines
Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions
of the Linux kernel. Patch by Yaniv Aknin.
........
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 1 |
3 files changed, 5 insertions, 0 deletions
@@ -13,6 +13,7 @@ David Abrahams Jim Ahlstrom Farhan Ahmad Nir Aides +Yaniv Aknin Jyrki Alakuijala Billy G. Allie Kevin Altis @@ -339,6 +339,9 @@ C-API Library ------- +- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions + of the Linux kernel. Patch by Yaniv Aknin. + - Issue #8295: Added shutil.unpack_archive. - Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 9dade1dacf..085d58562e 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1290,6 +1290,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, char *straddr; addr = (struct sockaddr_l2 *)addr_ret; + memset(addr, 0, sizeof(struct sockaddr_l2)); _BT_L2_MEMB(addr, family) = AF_BLUETOOTH; if (!PyArg_ParseTuple(args, "si", &straddr, &_BT_L2_MEMB(addr, psm))) { |