summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 c5ecfa2..e254d34 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -12,6 +12,7 @@ PS: In the standard Python distribution, this file is encoded in UTF-8.
David Abrahams
Jim Ahlstrom
Farhan Ahmad
+Yaniv Aknin
Jyrki Alakuijala
Billy G. Allie
Kevin Altis
diff --git a/Misc/NEWS b/Misc/NEWS
index 55f4e7a..0e45fef 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,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 1a45c53..636571c 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))) {