Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1160: Fix compiling large regular expressions on UCS2 builds.

Browse source 
Patch by Serhiy Storchaka.
This commit is contained in:
Antoine Pitrou 2012-11-20 22:30:42 +01:00
parent 4a1fdcf07d
commit 39bdad813a
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_re.py
View file

@ -419,6 +419,12 @@ def test_bigcharset(self):
self.assertEqual(re.match("([\u2222\u2223])", self.assertEqual(re.match("([\u2222\u2223])",
"\u2222", re.UNICODE).group(1), "\u2222") "\u2222", re.UNICODE).group(1), "\u2222")
def test_big_codesize(self):
# Issue #1160
r = re.compile('|'.join(('%d'%x for x in range(10000))))
self.assertIsNotNone(r.match('1000'))
self.assertIsNotNone(r.match('9999'))
def test_anyall(self): def test_anyall(self):
self.assertEqual(re.match("a.b", "a\nb", re.DOTALL).group(0), self.assertEqual(re.match("a.b", "a\nb", re.DOTALL).group(0),
"a\nb") "a\nb")

3
Misc/NEWS
View file

@ -167,6 +167,9 @@ Core and Builtins
Library Library
------- -------
- Issue #1160: Fix compiling large regular expressions on UCS2 builds.
Patch by Serhiy Storchaka.
- Issue #14313: zipfile now raises NotImplementedError when the compression - Issue #14313: zipfile now raises NotImplementedError when the compression
type is unknown. type is unknown.

11
Modules/_sre.c
View file

@ -2695,6 +2695,13 @@ _compile(PyObject* self_, PyObject* args)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
PyObject *o = PyList_GET_ITEM(code, i); PyObject *o = PyList_GET_ITEM(code, i);
unsigned long value = PyLong_AsUnsignedLong(o); unsigned long value = PyLong_AsUnsignedLong(o);
if (value == (unsigned long)-1 && PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
PyErr_SetString(PyExc_OverflowError,
"regular expression code size limit exceeded");
}
break;
}
self->code[i] = (SRE_CODE) value; self->code[i] = (SRE_CODE) value;
if ((unsigned long) self->code[i] != value) { if ((unsigned long) self->code[i] != value) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
@ -3065,10 +3072,8 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups)
GET_ARG; max = arg; GET_ARG; max = arg;
if (min > max) if (min > max)
FAIL; FAIL;
#ifdef Py_UNICODE_WIDE
if (max > 65535) if (max > 65535)
FAIL; FAIL;
#endif
if (!_validate_inner(code, code+skip-4, groups)) if (!_validate_inner(code, code+skip-4, groups))
FAIL; FAIL;
code += skip-4; code += skip-4;
@ -3086,10 +3091,8 @@ _validate_inner(SRE_CODE *code, SRE_CODE *end, Py_ssize_t groups)
GET_ARG; max = arg; GET_ARG; max = arg;
if (min > max) if (min > max)
FAIL; FAIL;
#ifdef Py_UNICODE_WIDE
if (max > 65535) if (max > 65535)
FAIL; FAIL;
#endif
if (!_validate_inner(code, code+skip-3, groups)) if (!_validate_inner(code, code+skip-3, groups))
FAIL; FAIL;
code += skip-3; code += skip-3;

6
Modules/sre.h
View file

@ -14,12 +14,8 @@
#include "sre_constants.h" #include "sre_constants.h"
/* size of a code word (must be unsigned short or larger, and /* size of a code word (must be unsigned short or larger, and
large enough to hold a Py_UNICODE character) */ large enough to hold a UCS4 character) */
#ifdef Py_UNICODE_WIDE
#define SRE_CODE Py_UCS4 #define SRE_CODE Py_UCS4
#else
#define SRE_CODE unsigned short
#endif
typedef struct { typedef struct {
PyObject_VAR_HEAD PyObject_VAR_HEAD