mirror of
https://github.com/python/cpython.git
synced 2025-08-02 16:13:13 +00:00
Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file
doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int (length bigger than 2^31-1 bytes).
This commit is contained in:
parent
645b9f67ae
commit
0a92d1849e
3 changed files with 31 additions and 1 deletions
|
@ -1,6 +1,8 @@
|
||||||
# xml.etree test for cElementTree
|
# xml.etree test for cElementTree
|
||||||
|
|
||||||
from test import test_support
|
from test import test_support
|
||||||
|
from test.test_support import precisionbigmemtest, _2G
|
||||||
|
import unittest
|
||||||
|
|
||||||
cET = test_support.import_module('xml.etree.cElementTree')
|
cET = test_support.import_module('xml.etree.cElementTree')
|
||||||
|
|
||||||
|
@ -15,6 +17,20 @@ def sanity():
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
class MiscTests(unittest.TestCase):
|
||||||
|
# Issue #8651.
|
||||||
|
@precisionbigmemtest(size=_2G + 100, memuse=1)
|
||||||
|
def test_length_overflow(self, size):
|
||||||
|
if size < _2G + 100:
|
||||||
|
self.skipTest("not enough free memory, need at least 2 GB")
|
||||||
|
data = b'x' * size
|
||||||
|
parser = cET.XMLParser()
|
||||||
|
try:
|
||||||
|
self.assertRaises(OverflowError, parser.feed, data)
|
||||||
|
finally:
|
||||||
|
data = None
|
||||||
|
|
||||||
|
|
||||||
def test_main():
|
def test_main():
|
||||||
from test import test_xml_etree, test_xml_etree_c
|
from test import test_xml_etree, test_xml_etree_c
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,10 @@ What's New in Python 2.7.2?
|
||||||
Core and Builtins
|
Core and Builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file
|
||||||
|
doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int
|
||||||
|
(length bigger than 2^31-1 bytes).
|
||||||
|
|
||||||
- Issue #8651: Fix "z#" format of PyArg_Parse*() function: the size was not
|
- Issue #8651: Fix "z#" format of PyArg_Parse*() function: the size was not
|
||||||
written if PY_SSIZE_T_CLEAN is defined.
|
written if PY_SSIZE_T_CLEAN is defined.
|
||||||
|
|
||||||
|
|
|
@ -585,7 +585,17 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
|
||||||
#define FETCH_SIZE int *q=NULL;Py_ssize_t *q2=NULL;\
|
#define FETCH_SIZE int *q=NULL;Py_ssize_t *q2=NULL;\
|
||||||
if (flags & FLAG_SIZE_T) q2=va_arg(*p_va, Py_ssize_t*); \
|
if (flags & FLAG_SIZE_T) q2=va_arg(*p_va, Py_ssize_t*); \
|
||||||
else q=va_arg(*p_va, int*);
|
else q=va_arg(*p_va, int*);
|
||||||
#define STORE_SIZE(s) if (flags & FLAG_SIZE_T) *q2=s; else *q=s;
|
#define STORE_SIZE(s) \
|
||||||
|
if (flags & FLAG_SIZE_T) \
|
||||||
|
*q2=s; \
|
||||||
|
else { \
|
||||||
|
if (INT_MAX < s) { \
|
||||||
|
PyErr_SetString(PyExc_OverflowError, \
|
||||||
|
"size does not fit in an int"); \
|
||||||
|
return converterr("", arg, msgbuf, bufsize); \
|
||||||
|
} \
|
||||||
|
*q=s; \
|
||||||
|
}
|
||||||
#define BUFFER_LEN ((flags & FLAG_SIZE_T) ? *q2:*q)
|
#define BUFFER_LEN ((flags & FLAG_SIZE_T) ? *q2:*q)
|
||||||
|
|
||||||
const char *format = *p_format;
|
const char *format = *p_format;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue