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 830d582d2733a5d3982f5bac6695018106c76bf2..7a7d879cc6100c58c3acefa6d7de14a82efc51cd 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -13,6 +13,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 90638ece97f7c4d2796cfcdebad960eab2b79f1a..b3be6e9c8c7985b1f63831cf226fd63a55f446ad 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -339,6 +339,9 @@ C-API
 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 9dade1dacf575a494b969264ad01f30f002c62a0..085d58562ed4f01f150c45e42dd4ac5582e513d4 100644 (file)
--- 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))) {