From 72867d611d703100327ea3f12453b75bdce031d6 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 29 Apr 2010 10:18:33 +0000 Subject: [PATCH] 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. ........ ................ --- Misc/ACKS | 1 + Misc/NEWS | 3 +++ Modules/socketmodule.c | 1 + 3 files changed, 5 insertions(+) diff --git a/Misc/ACKS b/Misc/ACKS index c5ecfa2c356..e254d341ea3 100644 --- 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 55f4e7ac1e0..0e45fef3bc1 100644 --- 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 1a45c5377c7..636571cd69d 100644 --- 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))) {