summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-08-20 17:30:46 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-08-20 17:30:46 (GMT)
commit75506e8b7cc1b21fd10997e4e5d382c515558fa8 (patch)
tree3847d540e00e46db8a9262754ecc3dcd2e906c2d
parent07795df68345a481fbd72c8cce452666000cbadd (diff)
downloadcpython-75506e8b7cc1b21fd10997e4e5d382c515558fa8.zip
cpython-75506e8b7cc1b21fd10997e4e5d382c515558fa8.tar.gz
cpython-75506e8b7cc1b21fd10997e4e5d382c515558fa8.tar.bz2
Issue #15726: Fix incorrect bounds checking in PyState_FindModule.
Patch by Robin Schreiber.
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/pystate.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 2e72f22..0d851df 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -848,6 +848,7 @@ Ralf Schmitt
Michael Schneider
Peter Schneider-Kamp
Arvin Schnell
+Robin Schreiber
Chad J. Schroeder
Sam Schulenburg
Stefan Schwarzer
diff --git a/Misc/NEWS b/Misc/NEWS
index 857a1615..74c168f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.4
Core and Builtins
-----------------
+- Issue #15726: Fix incorrect bounds checking in PyState_FindModule.
+ Patch by Robin Schreiber.
+
- Issue #15604: Update uses of PyObject_IsTrue() to check for and handle
errors correctly. Patch by Serhiy Storchaka.
diff --git a/Python/pystate.c b/Python/pystate.c
index 31b5423..1392331 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -248,7 +248,7 @@ PyState_FindModule(struct PyModuleDef* m)
return NULL;
if (state->modules_by_index == NULL)
return NULL;
- if (index > PyList_GET_SIZE(state->modules_by_index))
+ if (index >= PyList_GET_SIZE(state->modules_by_index))
return NULL;
res = PyList_GET_ITEM(state->modules_by_index, index);
return res==Py_None ? NULL : res;