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 c5ecfa2c356d39dac2c5b47039c32b781a6b8dfe..e254d341ea361404c1edd50920e5defa7c307775 100644 (file)
--- 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 55f4e7ac1e046a7f04d5f9f8f96853bd7f46ccfb..0e45fef3bc17b57c1e0ed06efdd73a8f2c65f312 100644 (file)
--- 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 1a45c5377c73f1c5a750424aaeebad93ff845d75..636571cd69de8f35e66514f671d397ffec4231c6 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))) {