summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-29 10:05:40 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-29 10:05:40 (GMT)
commitf56a288b1e59cc260372f32665a209d381be404b (patch)
tree26f839f6ca2aaa017e2d2cb125f52c4ae4c03fd6
parentb17b3c51e20799e4e82b839edb033971cdc4dcc2 (diff)
downloadcpython-f56a288b1e59cc260372f32665a209d381be404b.zip
cpython-f56a288b1e59cc260372f32665a209d381be404b.tar.gz
cpython-f56a288b1e59cc260372f32665a209d381be404b.tar.bz2
Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions
of the Linux kernel. Patch by Yaniv Aknin.
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/socketmodule.c1
3 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0bb62ae..af6a7be 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -14,6 +14,7 @@ David Abrahams
Jim Ahlstrom
Farhan Ahmad
Nir Aides
+Yaniv Aknin
Jyrki Alakuijala
Billy G. Allie
Kevin Altis
diff --git a/Misc/NEWS b/Misc/NEWS
index 1f584f4..470c07c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,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 901cb7d..0625acb 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1326,6 +1326,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))) {