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 830d582..7a7d879 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -13,6 +13,7 @@
Jim Ahlstrom
Farhan Ahmad
Nir Aides
+Yaniv Aknin
Jyrki Alakuijala
Billy G. Allie
Kevin Altis
diff --git a/Misc/NEWS b/Misc/NEWS
index 90638ec..b3be6e9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -339,6 +339,9 @@
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 9dade1d..085d585 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))) {