Mercurial > cpython-lru_cache-weakref

diff Modules/socketmodule.c @ 61086:e918b84ef968 3.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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. ........ ................
author Antoine Pitrou <solipsis@pitrou.net>
date Thu, 29 Apr 2010 10:18:33 +0000
parents 32e0f1aa34bc
children f197407bdba2
line wrap: on
line diff
--- a/Modules/socketmodule.c	Wed Apr 28 22:58:16 2010 +0000
+++ b/Modules/socketmodule.c	Thu Apr 29 10:18:33 2010 +0000
@@ -1290,6 +1290,7 @@
 			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))) {