From bb804c74a095efe20bc315f7ea83475d5b14a288 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Thu, 29 Apr 2010 10:07:38 +0000 Subject: [PATCH] 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 c324936bb9b..f6ced6d404f 100644 --- 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 0bd215f1877..af424706ca0 100644 --- 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 6c2e2088a80..209b72f249c 100644 --- 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))) {