[Python-checkins] cpython (3.2): Issue #16230: Fix a crash in select.select() when one the lists changes size

Thu Nov 1 20:20:33 CET 2012

http://hg.python.org/cpython/rev/87ccf2635ad7
changeset: 80161:87ccf2635ad7
branch: 3.2
parent: 80157:3672db224eb3
user: Antoine Pitrou <solipsis at pitrou.net>
date: Thu Nov 01 20:13:54 2012 +0100
summary:
 Issue #16230: Fix a crash in select.select() when one the lists changes size while iterated on.
Patch by Serhiy Storchaka.
files:
 Lib/test/test_select.py | 10 ++++++++++
 Misc/NEWS | 3 +++
 Modules/selectmodule.c | 6 ++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -49,6 +49,16 @@
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@
 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
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -83,7 +83,7 @@
 {
 int max = -1;
 int index = 0;
- Py_ssize_t i, len = -1;
+ Py_ssize_t i;
 PyObject* fast_seq = NULL;
 PyObject* o = NULL;
 
@@ -94,9 +94,7 @@
 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 */
-- 
Repository URL: http://hg.python.org/cpython
