Merged revisions 80612 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80612 | antoine.pitrou | 2010-04-29 12:11:46 +0200 (jeu., 29 avril 2010) | 10 lines
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.
........
................
diff --git a/Misc/ACKS b/Misc/ACKS
index c5ecfa2..e254d34 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -12,6 +12,7 @@
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 @@
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 @@
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))) {