diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-29 10:07:38 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-29 10:07:38 (GMT) |
| commit | bb804c74a095efe20bc315f7ea83475d5b14a288 (patch) | |
| tree | d9227bcd70f80f9d38d5af598d8a2dd9c2706f5e | |
| parent | ef9525af01fc7e9bd44d790864657f8d918aedfe (diff) | |
| download | cpython-bb804c74a095efe20bc315f7ea83475d5b14a288.zip cpython-bb804c74a095efe20bc315f7ea83475d5b14a288.tar.gz cpython-bb804c74a095efe20bc315f7ea83475d5b14a288.tar.bz2 | |
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 @@ PS: In the standard Python distribution, this file is encoded in Latin-1. David Abrahams Jim Ahlstrom Farhan Ahmad +Yaniv Aknin Jyrki Alakuijala Billy G. Allie Kevin Altis @@ -33,6 +33,9 @@ Core and Builtins Library ------- +- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions + of the Linux kernel. Patch by Yaniv Aknin. + - Issue #6312: Fixed http HEAD request when the transfer encoding is chunked. It should correctly return an empty response now. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 6c2e208..209b72f 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1314,6 +1314,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))) { |