diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-30 02:18:09 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-30 02:18:09 (GMT) |
| commit | a8a93042dcfb6673da1a67726e5028c7582099ea (patch) | |
| tree | c8e097854723da1cddf587321661d705cba98263 | |
| parent | cb9a5517d0806a55aa9432b1305537dd8f5c062b (diff) | |
| download | cpython-a8a93042dcfb6673da1a67726e5028c7582099ea.zip cpython-a8a93042dcfb6673da1a67726e5028c7582099ea.tar.gz cpython-a8a93042dcfb6673da1a67726e5028c7582099ea.tar.bz2 | |
Merged revisions 66693 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66693 | benjamin.peterson | 2008-09-29 21:11:07 -0500 (Mon, 29 Sep 2008) | 4 lines
Victor Stinner's patches to check the return result of PyLong_Ssize_t
reviewed by Amaury
........
| -rw-r--r-- | Modules/_bytesio.c | 8 | ||||
| -rw-r--r-- | Modules/_struct.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Modules/_bytesio.c b/Modules/_bytesio.c index d7d2667..48fe50a 100644 --- a/Modules/_bytesio.c +++ b/Modules/_bytesio.c @@ -221,6 +221,8 @@ bytesio_read(BytesIOObject *self, PyObject *args) if (PyLong_Check(arg)) { size = PyLong_AsSsize_t(arg); + if (size == -1 && PyErr_Occurred()) + return NULL; } else if (arg == Py_None) { /* Read until EOF is reached, by default. */ @@ -288,6 +290,8 @@ bytesio_readline(BytesIOObject *self, PyObject *args) if (PyLong_Check(arg)) { size = PyLong_AsSsize_t(arg); + if (size == -1 && PyErr_Occurred()) + return NULL; } else if (arg == Py_None) { /* No size limit, by default. */ @@ -332,6 +336,8 @@ bytesio_readlines(BytesIOObject *self, PyObject *args) if (PyLong_Check(arg)) { maxsize = PyLong_AsSsize_t(arg); + if (maxsize == -1 && PyErr_Occurred()) + return NULL; } else if (arg == Py_None) { /* No size limit, by default. */ @@ -415,6 +421,8 @@ bytesio_truncate(BytesIOObject *self, PyObject *args) if (PyLong_Check(arg)) { size = PyLong_AsSsize_t(arg); + if (size == -1 && PyErr_Occurred()) + return NULL; } else if (arg == Py_None) { /* Truncate to current position if no argument is passed. */ diff --git a/Modules/_struct.c b/Modules/_struct.c index 4a257c0..ac70f43 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1786,6 +1786,8 @@ s_pack_into(PyObject *self, PyObject *args) /* Extract the offset from the first argument */ offset = PyLong_AsSsize_t(PyTuple_GET_ITEM(args, 1)); + if (offset == -1 && PyErr_Occurred()) + return NULL; /* Support negative offsets. */ if (offset < 0) |