summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-29 10:11:46 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-29 10:11:46 (GMT)
commitbf043491a10e65706c0305050de86c91ab2fae62 (patch)
tree1bdc54bebeb000c3fa85bf53de714f9acb8f0018 /Modules
parent764b8780db08cf02891b2d7bdce920ae167f8188 (diff)
downloadcpython-bf043491a10e65706c0305050de86c91ab2fae62.zip
cpython-bf043491a10e65706c0305050de86c91ab2fae62.tar.gz
cpython-bf043491a10e65706c0305050de86c91ab2fae62.tar.bz2
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. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/socketmodule.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 9dade1d..085d585 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))) {