[Python-checkins] r80612 - in python/branches/py3k: Misc/ACKS Misc/NEWS Modules/socketmodule.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Thu Apr 29 12:11:46 2010
New Revision: 80612

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Misc/ACKS
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/socketmodule.c

Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Thu Apr 29 12:11:46 2010
@@ -13,6 +13,7 @@
 Jim Ahlstrom
 Farhan Ahmad
 Nir Aides
+Yaniv Aknin
 Jyrki Alakuijala
 Billy G. Allie
 Kevin Altis

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Apr 29 12:11:46 2010
@@ -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.

Modified: python/branches/py3k/Modules/socketmodule.c
==============================================================================
--- python/branches/py3k/Modules/socketmodule.c	(original)
+++ python/branches/py3k/Modules/socketmodule.c	Thu Apr 29 12:11:46 2010
@@ -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))) {