summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-11-01 19:16:07 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-11-01 19:16:07 (GMT)
commit787fbe9d6b1072ff5a8317f39eaed1a409f263f1 (patch)
treeea356e874579f382c4e912053683332762738731
parent53d36b691241f278fa6173034e6edb10154e62d3 (diff)
parent0168d3d9b1f6c236b23afedab3c61254fcb6f072 (diff)
downloadcpython-787fbe9d6b1072ff5a8317f39eaed1a409f263f1.zip
cpython-787fbe9d6b1072ff5a8317f39eaed1a409f263f1.tar.gz
cpython-787fbe9d6b1072ff5a8317f39eaed1a409f263f1.tar.bz2
Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on.
Patch by Serhiy Storchaka.
-rw-r--r--Lib/test/test_select.py10
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/selectmodule.c6
3 files changed, 15 insertions, 4 deletions
diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
index 6a810c6..496709c 100644
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -65,6 +65,16 @@ class SelectTestCase(unittest.TestCase):
self.fail('Unexpected return values from select():', rfd, wfd, xfd)
p.close()
+ # Issue 16230: Crash on select resized list
+ def test_select_mutated(self):
+ a = []
+ class F:
+ def fileno(self):
+ del a[-1]
+ return sys.__stdout__.fileno()
+ a[:] = [F()] * 10
+ self.assertEqual(select.select([], a, []), ([], a[:5], []))
+
def test_main():
support.run_unittest(SelectTestCase)
support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
index fa203a6..6e869b6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -85,6 +85,9 @@ Core and Builtins
Library
-------
+- Issue #16230: Fix a crash in select.select() when one the lists changes
+ size while iterated on. Patch by Serhiy Storchaka.
+
- Issue #16228: Fix a crash in the json module where a list changes size
while it is being encoded. Patch by Serhiy Storchaka.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 9128ea3..c0f56a7 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -84,7 +84,7 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
{
int max = -1;
int index = 0;
- Py_ssize_t i, len = -1;
+ Py_ssize_t i;
PyObject* fast_seq = NULL;
PyObject* o = NULL;
@@ -95,9 +95,7 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
if (!fast_seq)
return -1;
- len = PySequence_Fast_GET_SIZE(fast_seq);
-
- for (i = 0; i < len; i++) {
+ for (i = 0; i < PySequence_Fast_GET_SIZE(fast_seq); i++) {
SOCKET v;
/* any intervening fileno() calls could decr this refcnt */