summaryrefslogtreecommitdiffstats
path: root/Modules/socketmodule.c
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-29 10:07:38 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-29 10:07:38 (GMT)
commitbb804c74a095efe20bc315f7ea83475d5b14a288 (patch)
treed9227bcd70f80f9d38d5af598d8a2dd9c2706f5e /Modules/socketmodule.c
parentef9525af01fc7e9bd44d790864657f8d918aedfe (diff)
downloadcpython-bb804c74a095efe20bc315f7ea83475d5b14a288.zip
cpython-bb804c74a095efe20bc315f7ea83475d5b14a288.tar.gz
cpython-bb804c74a095efe20bc315f7ea83475d5b14a288.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/socketmodule.c')
-rw-r--r--Modules/socketmodule.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 6c2e208..209b72f 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))) {