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 c324936bb9b85a5c0417cb2f3c92a776f84d3443..f6ced6d404f882282dbdcee8ed156a88fc23842c 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -13,6 +13,7 @@ PS: In the standard Python distribution, this file is encoded in Latin-1.
 David Abrahams
 Jim Ahlstrom
 Farhan Ahmad
+Yaniv Aknin
 Jyrki Alakuijala
 Billy G. Allie
 Kevin Altis

diff --git a/Misc/NEWS b/Misc/NEWS
index 0bd215f18771bc7186648cf5cd4a0924f0fa4f07..af424706ca00e002b9fc4d4b322987f0d81bb9b9 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,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 6c2e2088a8083734e0c97f17c4bbb3e10cbcef1b..209b72f249c53a5908046070085f6677a59d142e 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1314,6 +1314,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))) {