diff options
| -rw-r--r-- | Lib/test/test_pyexpat.py | 3 | ||||
| -rw-r--r-- | Modules/pyexpat.c | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py index 7548924..216a46b 100644 --- a/Lib/test/test_pyexpat.py +++ b/Lib/test/test_pyexpat.py @@ -3,6 +3,7 @@ from io import BytesIO import os +import sys import sysconfig import unittest import traceback @@ -543,6 +544,8 @@ class ChardataBufferTest(unittest.TestCase): parser.buffer_size = -1 with self.assertRaises(ValueError): parser.buffer_size = 0 + with self.assertRaises((ValueError, OverflowError)): + parser.buffer_size = sys.maxsize + 1 with self.assertRaises(TypeError): parser.buffer_size = 512.0 diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index c4fdaaf..6a901f7 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1403,17 +1403,18 @@ xmlparse_setattro(xmlparseobject *self, PyObject *name, PyObject *v) return -1; } - new_buffer_size=PyLong_AS_LONG(v); + new_buffer_size = PyLong_AsLong(v); + if (new_buffer_size <= 0) { + if (!PyErr_Occurred()) + PyErr_SetString(PyExc_ValueError, "buffer_size must be greater than zero"); + return -1; + } + /* trivial case -- no change */ if (new_buffer_size == self->buffer_size) { return 0; } - if (new_buffer_size <= 0) { - PyErr_SetString(PyExc_ValueError, "buffer_size must be greater than zero"); - return -1; - } - /* check maximum */ if (new_buffer_size > INT_MAX) { char errmsg[100]; |