Mailman 3 September 2011 - Python-checkins

Daily reference leaks (3c56e546dc60): sum=0
by solipsis＠pitrou.net Sept. 20, 2011

Sept. 20, 2011

results for 3c56e546dc60 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogYlKf07', '-x']

1 0

cpython: Issue #1172711: Update What's New in Python 3.3 document for the array module.
by meador.inge Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/672b63aff0f4 changeset: 72437:672b63aff0f4 user: Meador Inge <meadori(a)gmail.com> date: Tue Sep 20 21:48:16 2011 -0500 summary: Issue #1172711: Update What's New in Python 3.3 document for the array module. The commit fixes 3c56e546dc60, which documented #1172711 as a struct module change; it is an array module change. files: Doc/whatsnew/3.3.rst | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git … [View More]

1 0

cpython (merge 3.2 -> default): Close #13022: _multiprocessing.recvfd() doesn't check that file descriptor was
by jesus.cea Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/74434cff2c90 changeset: 72436:74434cff2c90 parent: 72433:c372a79c771e parent: 72435:447770470d00 user: Jesus Cea <jcea(a)jcea.es> date: Wed Sep 21 03:56:05 2011 +0200 summary: Close #13022: _multiprocessing.recvfd() doesn't check that file descriptor was actually received files: Lib/test/test_multiprocessing.py | 17 ++++++++++ Misc/NEWS | 3 + Modules/_multiprocessing/… [View More]multiprocessing.c | 11 ++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1689,6 +1689,23 @@ with open(test.support.TESTFN, "rb") as f: self.assertEqual(f.read(), b"bar") + @classmethod + def _send_data_without_fd(self, conn): + os.write(conn.fileno(), b"\0") + + @unittest.skipIf(sys.platform == "win32", "doesn't make sense on Windows") + def test_missing_fd_transfer(self): + # Check that exception is raised when received data is not + # accompanied by a file descriptor in ancillary data. + if self.TYPE != 'processes': + self.skipTest("only makes sense with processes") + conn, child_conn = self.Pipe(duplex=True) + + p = self.Process(target=self._send_data_without_fd, args=(child_conn,)) + p.daemon = True + p.start() + self.assertRaises(RuntimeError, reduction.recv_handle, conn) + p.join() class _TestListenerClient(BaseTestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1287,6 +1287,9 @@ Extension Modules ----------------- +- Issue #13022: Fix: _multiprocessing.recvfd() doesn't check that + file descriptor was actually received. + - Issue #1172711: Add 'long long' support to the array module. Initial patch by Oren Tirosh and Hirokazu Yamamoto. diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -166,6 +166,17 @@ if (res < 0) return PyErr_SetFromErrno(PyExc_OSError); + if (msg.msg_controllen < CMSG_LEN(sizeof(int)) || + (cmsg = CMSG_FIRSTHDR(&msg)) == NULL || + cmsg->cmsg_level != SOL_SOCKET || + cmsg->cmsg_type != SCM_RIGHTS || + cmsg->cmsg_len < CMSG_LEN(sizeof(int))) { + /* If at least one control message is present, there should be + no room for any further data in the buffer. */ + PyErr_SetString(PyExc_RuntimeError, "No file descriptor received"); + return NULL; + } + fd = * (int *) CMSG_DATA(cmsg); return Py_BuildValue("i", fd); } -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython (3.2): Close #13022: _multiprocessing.recvfd() doesn't check that file descriptor was
by jesus.cea Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/447770470d00 changeset: 72435:447770470d00 branch: 3.2 parent: 72428:e06db421e4c4 user: Jesus Cea <jcea(a)jcea.es> date: Wed Sep 21 03:53:25 2011 +0200 summary: Close #13022: _multiprocessing.recvfd() doesn't check that file descriptor was actually received files: Lib/test/test_multiprocessing.py | 17 ++++++++++ Misc/NEWS | 3 + Modules/_multiprocessing/multiprocessing.c | 11 +… [View More]+++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1632,6 +1632,23 @@ with open(test.support.TESTFN, "rb") as f: self.assertEqual(f.read(), b"bar") + @classmethod + def _send_data_without_fd(self, conn): + os.write(conn.fileno(), b"\0") + + @unittest.skipIf(sys.platform == "win32", "doesn't make sense on Windows") + def test_missing_fd_transfer(self): + # Check that exception is raised when received data is not + # accompanied by a file descriptor in ancillary data. + if self.TYPE != 'processes': + self.skipTest("only makes sense with processes") + conn, child_conn = self.Pipe(duplex=True) + + p = self.Process(target=self._send_data_without_fd, args=(child_conn,)) + p.daemon = True + p.start() + self.assertRaises(RuntimeError, reduction.recv_handle, conn) + p.join() class _TestListenerClient(BaseTestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -78,6 +78,9 @@ Extension Modules ----------------- +- Issue #13022: Fix: _multiprocessing.recvfd() doesn't check that + file descriptor was actually received. + - Issue #12483: ctypes: Fix a crash when the destruction of a callback object triggers the garbage collector. diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -177,6 +177,17 @@ if (res < 0) return PyErr_SetFromErrno(PyExc_OSError); + if (msg.msg_controllen < CMSG_LEN(sizeof(int)) || + (cmsg = CMSG_FIRSTHDR(&msg)) == NULL || + cmsg->cmsg_level != SOL_SOCKET || + cmsg->cmsg_type != SCM_RIGHTS || + cmsg->cmsg_len < CMSG_LEN(sizeof(int))) { + /* If at least one control message is present, there should be + no room for any further data in the buffer. */ + PyErr_SetString(PyExc_RuntimeError, "No file descriptor received"); + return NULL; + } + fd = * (int *) CMSG_DATA(cmsg); return Py_BuildValue("i", fd); } -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython (2.7): Close #13022: _multiprocessing.recvfd() doesn't check that file descriptor was
by jesus.cea Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/21e7a55cb943 changeset: 72434:21e7a55cb943 branch: 2.7 parent: 72419:f8280cf63d9e user: Jesus Cea <jcea(a)jcea.es> date: Wed Sep 21 03:47:39 2011 +0200 summary: Close #13022: _multiprocessing.recvfd() doesn't check that file descriptor was actually received files: Lib/test/test_multiprocessing.py | 17 ++++++++++ Misc/NEWS | 3 + Modules/_multiprocessing/multiprocessing.c | 11 +… [View More]+++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -1574,6 +1574,23 @@ with open(test_support.TESTFN, "rb") as f: self.assertEqual(f.read(), b"bar") + @classmethod + def _send_data_without_fd(self, conn): + os.write(conn.fileno(), b"\0") + + @unittest.skipIf(sys.platform == "win32", "doesn't make sense on Windows") + def test_missing_fd_transfer(self): + # Check that exception is raised when received data is not + # accompanied by a file descriptor in ancillary data. + if self.TYPE != 'processes': + self.skipTest("only makes sense with processes") + conn, child_conn = self.Pipe(duplex=True) + + p = self.Process(target=self._send_data_without_fd, args=(child_conn,)) + p.daemon = True + p.start() + self.assertRaises(RuntimeError, reduction.recv_handle, conn) + p.join() class _TestListenerClient(BaseTestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -201,6 +201,9 @@ Extension Modules ----------------- +- Issue #13022: Fix: _multiprocessing.recvfd() doesn't check that + file descriptor was actually received. + - Issue #12483: ctypes: Fix a crash when the destruction of a callback object triggers the garbage collector. diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -177,6 +177,17 @@ if (res < 0) return PyErr_SetFromErrno(PyExc_OSError); + if (msg.msg_controllen < CMSG_LEN(sizeof(int)) || + (cmsg = CMSG_FIRSTHDR(&msg)) == NULL || + cmsg->cmsg_level != SOL_SOCKET || + cmsg->cmsg_type != SCM_RIGHTS || + cmsg->cmsg_len < CMSG_LEN(sizeof(int))) { + /* If at least one control message is present, there should be + no room for any further data in the buffer. */ + PyErr_SetString(PyExc_RuntimeError, "No file descriptor received"); + return NULL; + } + fd = * (int *) CMSG_DATA(cmsg); return Py_BuildValue("i", fd); } -- Repository URL: http://hg.python.org/cpython [View Less]

1 0

cpython: meth.log2 doc: add a link to int.bit_length()
by victor.stinner Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/2d9c4635caf0 changeset: 72432:2d9c4635caf0 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Sep 21 03:35:18 2011 +0200 summary: meth.log2 doc: add a link to int.bit_length() files: Doc/library/math.rst | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Doc/library/math.rst b/Doc/library/math.rst --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -191,6 +191,11 @@ .. versionadded:: 3.… [View More]

1 0

cpython: What's New in Python 3.3: add curses.unget_wch()
by victor.stinner Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/c372a79c771e changeset: 72433:c372a79c771e user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Sep 21 03:35:44 2011 +0200 summary: What's New in Python 3.3: add curses.unget_wch() files: Doc/whatsnew/3.3.rst | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -94,17 +94,21 @@ crypt ----- -… [View More]

1 0

cpython: Issue #1172711: Update What's New in Python 3.3 document for the struct module
by victor.stinner Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/3c56e546dc60 changeset: 72431:3c56e546dc60 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Sep 21 03:20:03 2011 +0200 summary: Issue #1172711: Update What's New in Python 3.3 document for the struct module files: Doc/whatsnew/3.3.rst | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.… [View More]

1 0

cpython (3.2): test_multiprocessing removes temporary files
by victor.stinner Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/e06db421e4c4 changeset: 72428:e06db421e4c4 branch: 3.2 parent: 72426:950515bff239 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Sep 21 01:10:29 2011 +0200 summary: test_multiprocessing removes temporary files files: Lib/test/test_multiprocessing.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py --- a/Lib/test/… [View More]

1 0

cpython (merge 3.2 -> default): Merge 3.2: test_multiprocessing removes temporary files
by victor.stinner Sept. 20, 2011

Sept. 20, 2011

http://hg.python.org/cpython/rev/c545ed50eac8 changeset: 72429:c545ed50eac8 parent: 72427:1d71aa589549 parent: 72428:e06db421e4c4 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Sep 21 01:12:59 2011 +0200 summary: Merge 3.2: test_multiprocessing removes temporary files files: Lib/test/test_multiprocessing.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/… [View More]

1 0