diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-08-08 22:07:16 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-08-08 22:07:16 (GMT) |
| commit | eb6f3ead00f1cccffafba03245861a4d6bd84346 (patch) | |
| tree | ae40df9ad342570b5e149d4afeddc8a0e34fd284 | |
| parent | bddc9fe22bb5d78bfb3db891d3b2d56d963f6e04 (diff) | |
| download | cpython-eb6f3ead00f1cccffafba03245861a4d6bd84346.zip cpython-eb6f3ead00f1cccffafba03245861a4d6bd84346.tar.gz cpython-eb6f3ead00f1cccffafba03245861a4d6bd84346.tar.bz2 | |
Fix #8530: Prevent stringlib fastsearch from reading beyond the front of an array.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/stringlib/fastsearch.h | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 2? Core and Builtins ----------------- +- Issue #8530: Prevent stringlib fastsearch from reading beyond the front + of an array. + - Issue #5319: Print an error if flushing stdout fails at interpreter shutdown. diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h index 7525951..e231c58 100644 --- a/Objects/stringlib/fastsearch.h +++ b/Objects/stringlib/fastsearch.h @@ -140,13 +140,13 @@ fastsearch(const STRINGLIB_CHAR* s, Py_ssize_t n, /* got a match! */ return i; /* miss: check if previous character is part of pattern */ - if (!STRINGLIB_BLOOM(mask, s[i-1])) + if (i > 0 && !STRINGLIB_BLOOM(mask, s[i-1])) i = i - m; else i = i - skip; } else { /* skip: check if previous character is part of pattern */ - if (!STRINGLIB_BLOOM(mask, s[i-1])) + if (i > 0 && !STRINGLIB_BLOOM(mask, s[i-1])) i = i - m; } } |