diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-29 10:18:33 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-29 10:18:33 (GMT) |
| commit | 72867d611d703100327ea3f12453b75bdce031d6 (patch) | |
| tree | ad40e0e3053c5e57541fa53d30f34f7cab5b158e /Modules | |
| parent | b199796f97565c6bc495b59076302e212cff0785 (diff) | |
| download | cpython-72867d611d703100327ea3f12453b75bdce031d6.zip cpython-72867d611d703100327ea3f12453b75bdce031d6.tar.gz cpython-72867d611d703100327ea3f12453b75bdce031d6.tar.bz2 | |
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.
........
................
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/socketmodule.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 1a45c53..636571c 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))) { |