Skip to content

bpo-28261: fix err msgs where PyArg_ParseTuple is used to parse normal tuples (leftovers) #3198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 2 commits into from
Aug 24, 2017
Merged

bpo-28261: fix err msgs where PyArg_ParseTuple is used to parse normal tuples (leftovers) #3198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0deab5b
init commit
orenmn Aug 24, 2017
ba3daf8
add an assert and fix a comment.
orenmn Aug 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions Modules/_io/textio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,15 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self)
_PyIO_str_getstate, NULL);
if (state == NULL)
return NULL;
if (!PyArg_ParseTuple(state, "OK", &buffer, &flag)) {
if (!PyTuple_Check(state)) {
PyErr_SetString(PyExc_TypeError,
"illegal decoder state");
Py_DECREF(state);
return NULL;
}
if (!PyArg_ParseTuple(state, "OK;illegal decoder state",
&buffer, &flag))
{
Py_DECREF(state);
return NULL;
}
Expand Down Expand Up @@ -669,7 +677,7 @@ typedef struct
written, or NULL */
Py_ssize_t pending_bytes_count;

/* snapshot is either None, or a tuple (dec_flags, next_input) where
/* snapshot is either NULL, or a tuple (dec_flags, next_input) where
* dec_flags is the second (integer) item of the decoder state and
* next_input is the chunk of input bytes that comes next after the
* snapshot point. We use this to reconstruct decoder states in tell().
Expand Down Expand Up @@ -2351,6 +2359,7 @@ _io_TextIOWrapper_tell_impl(textio *self)
goto fail;

/* Skip backward to the snapshot point (see _read_chunk). */
assert(PyTuple_Check(self->snapshot));
if (!PyArg_ParseTuple(self->snapshot, "iO", &cookie.dec_flags, &next_input))
goto fail;

Expand Down Expand Up @@ -2378,7 +2387,15 @@ _io_TextIOWrapper_tell_impl(textio *self)
_PyIO_str_getstate, NULL); \
if (_state == NULL) \
goto fail; \
if (!PyArg_ParseTuple(_state, "Oi", &dec_buffer, &dec_flags)) { \
if (!PyTuple_Check(_state)) { \
PyErr_SetString(PyExc_TypeError, \
"illegal decoder state"); \
Py_DECREF(_state); \
goto fail; \
} \
if (!PyArg_ParseTuple(_state, "Oi;illegal decoder state", \
&dec_buffer, &dec_flags)) \
{ \
Py_DECREF(_state); \
goto fail; \
} \
Expand Down