[Python-checkins] bpo-28261: Fixed err msgs where PyArg_ParseTuple is used to parse normal tuples. (#3119)
Serhiy Storchaka
webhook-mailer at python.org
Sun Aug 20 11:35:39 EDT 2017
https://github.com/python/cpython/commit/1d1d3e9db882d78433f5bc8dbe7df929f4b6b5e1
commit: 1d1d3e9db882d78433f5bc8dbe7df929f4b6b5e1
branch: master
author: Oren Milman <orenmn at gmail.com>
committer: Serhiy Storchaka <storchaka at gmail.com>
date: 2017-08-20T18:35:36+03:00
summary:
bpo-28261: Fixed err msgs where PyArg_ParseTuple is used to parse normal tuples. (#3119)
files:
M Lib/test/test_audioop.py
M Lib/test/test_io.py
M Modules/_ctypes/_ctypes.c
M Modules/_io/textio.c
M Modules/audioop.c
M Modules/overlapped.c
M Modules/socketmodule.c
M Modules/timemodule.c
diff --git a/Lib/test/test_audioop.py b/Lib/test/test_audioop.py
index 8f34d72427e..9baa62ad45c 100644
--- a/Lib/test/test_audioop.py
+++ b/Lib/test/test_audioop.py
@@ -405,6 +405,10 @@ def test_ratecv(self):
self.assertEqual(audioop.ratecv(datas[w], w, 1, 8000, 8000, None, 30, 10)[0],
expected[w])
+ self.assertRaises(TypeError, audioop.ratecv, b'', 1, 1, 8000, 8000, 42)
+ self.assertRaises(TypeError, audioop.ratecv,
+ b'', 1, 1, 8000, 8000, (1, (42,)))
+
def test_reverse(self):
for w in 1, 2, 3, 4:
self.assertEqual(audioop.reverse(b'', w), b'')
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 83d6c4e57ec..ab0cbe16361 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3472,6 +3472,7 @@ def test_newline_decoder(self):
decoder = codecs.getincrementaldecoder("utf-8")()
decoder = self.IncrementalNewlineDecoder(decoder, translate=True)
self.check_newline_decoding_utf8(decoder)
+ self.assertRaises(TypeError, decoder.setstate, 42)
def test_newline_bytes(self):
# Issue 5433: Excessive optimization in IncrementalNewlineDecoder
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index fe39567374d..010658ebcd4 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -3262,7 +3262,9 @@ PyCFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds)
/* Here ftuple is a borrowed reference */
return NULL;
- if (!PyArg_ParseTuple(ftuple, "O&O", _get_name, &name, &dll)) {
+ if (!PyArg_ParseTuple(ftuple, "O&O;illegal func_spec argument",
+ _get_name, &name, &dll))
+ {
Py_DECREF(ftuple);
return NULL;
}
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index b5d368a175c..57b66d66c33 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -562,8 +562,15 @@ _io_IncrementalNewlineDecoder_setstate(nldecoder_object *self,
PyObject *buffer;
unsigned long long flag;
- if (!PyArg_ParseTuple(state, "OK", &buffer, &flag))
+ if (!PyTuple_Check(state)) {
+ PyErr_SetString(PyExc_TypeError, "state argument must be a tuple");
return NULL;
+ }
+ if (!PyArg_ParseTuple(state, "OK;setstate(): illegal state argument",
+ &buffer, &flag))
+ {
+ return NULL;
+ }
self->pendingcr = (int) (flag & 1);
flag >>= 1;
diff --git a/Modules/audioop.c b/Modules/audioop.c
index dcd7788d621..80c8a2a8e52 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1293,7 +1293,7 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
char *cp, *ncp;
Py_ssize_t len;
int chan, d, *prev_i, *cur_i, cur_o;
- PyObject *samps, *str, *rv = NULL;
+ PyObject *samps, *str, *rv = NULL, *channel;
int bytes_per_frame;
if (!audioop_check_size(width))
@@ -1354,8 +1354,12 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
prev_i[chan] = cur_i[chan] = 0;
}
else {
+ if (!PyTuple_Check(state)) {
+ PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
+ goto exit;
+ }
if (!PyArg_ParseTuple(state,
- "iO!;audioop.ratecv: illegal state argument",
+ "iO!;ratecv(): illegal state argument",
&d, &PyTuple_Type, &samps))
goto exit;
if (PyTuple_Size(samps) != nchannels) {
@@ -1364,10 +1368,18 @@ audioop_ratecv_impl(PyObject *module, Py_buffer *fragment, int width,
goto exit;
}
for (chan = 0; chan < nchannels; chan++) {
- if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
- "ii:ratecv", &prev_i[chan],
- &cur_i[chan]))
+ channel = PyTuple_GetItem(samps, chan);
+ if (!PyTuple_Check(channel)) {
+ PyErr_SetString(PyExc_TypeError,
+ "ratecv(): illegal state argument");
goto exit;
+ }
+ if (!PyArg_ParseTuple(channel,
+ "ii;ratecv(): illegal state argument",
+ &prev_i[chan], &cur_i[chan]))
+ {
+ goto exit;
+ }
}
}
@@ -1638,7 +1650,9 @@ audioop_lin2adpcm_impl(PyObject *module, Py_buffer *fragment, int width,
PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
return NULL;
}
- else if (!PyArg_ParseTuple(state, "ii", &valpred, &index)) {
+ else if (!PyArg_ParseTuple(state, "ii;lin2adpcm(): illegal state argument",
+ &valpred, &index))
+ {
return NULL;
}
else if (valpred >= 0x8000 || valpred < -0x8000 ||
@@ -1766,7 +1780,9 @@ audioop_adpcm2lin_impl(PyObject *module, Py_buffer *fragment, int width,
PyErr_SetString(PyExc_TypeError, "state must be a tuple or None");
return NULL;
}
- else if (!PyArg_ParseTuple(state, "ii", &valpred, &index)) {
+ else if (!PyArg_ParseTuple(state, "ii;adpcm2lin(): illegal state argument",
+ &valpred, &index))
+ {
return NULL;
}
else if (valpred >= 0x8000 || valpred < -0x8000 ||
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index 4390e9ae93c..6099d46643f 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -990,7 +990,9 @@ parse_address(PyObject *obj, SOCKADDR *Address, int Length)
((SOCKADDR_IN*)Address)->sin_port = htons(Port);
return Length;
}
- else if (PyArg_ParseTuple(obj, "uHkk", &Host, &Port, &FlowInfo, &ScopeId))
+ else if (PyArg_ParseTuple(obj,
+ "uHkk;ConnectEx(): illegal address_as_bytes "
+ "argument", &Host, &Port, &FlowInfo, &ScopeId))
{
PyErr_Clear();
Address->sa_family = AF_INET6;
@@ -1024,8 +1026,11 @@ Overlapped_ConnectEx(OverlappedObject *self, PyObject *args)
BOOL ret;
DWORD err;
- if (!PyArg_ParseTuple(args, F_HANDLE "O", &ConnectSocket, &AddressObj))
+ if (!PyArg_ParseTuple(args, F_HANDLE "O!:ConnectEx",
+ &ConnectSocket, &PyTuple_Type, &AddressObj))
+ {
return NULL;
+ }
if (self->type != TYPE_NONE) {
PyErr_SetString(PyExc_ValueError, "operation already attempted");
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index e18dd32d900..bf8d19fe2f4 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5972,12 +5972,14 @@ socket_getnameinfo(PyObject *self, PyObject *args)
"getnameinfo() argument 1 must be a tuple");
return NULL;
}
- if (!PyArg_ParseTuple(sa, "si|II",
+ if (!PyArg_ParseTuple(sa, "si|II;getnameinfo(): illegal sockaddr argument",
&hostp, &port, &flowinfo, &scope_id))
+ {
return NULL;
+ }
if (flowinfo > 0xfffff) {
PyErr_SetString(PyExc_OverflowError,
- "getsockaddrarg: flowinfo must be 0-1048575.");
+ "getnameinfo(): flowinfo must be 0-1048575.");
return NULL;
}
PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 15c467b9b40..36a95bbcedd 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -415,7 +415,7 @@ When 'seconds' is not passed in, convert the current time instead.");
* an exception and return 0 on error.
*/
static int
-gettmarg(PyObject *args, struct tm *p)
+gettmarg(PyObject *args, struct tm *p, const char *format)
{
int y;
@@ -427,7 +427,7 @@ gettmarg(PyObject *args, struct tm *p)
return 0;
}
- if (!PyArg_ParseTuple(args, "iiiiiiiii",
+ if (!PyArg_ParseTuple(args, format,
&y, &p->tm_mon, &p->tm_mday,
&p->tm_hour, &p->tm_min, &p->tm_sec,
&p->tm_wday, &p->tm_yday, &p->tm_isdst))
@@ -586,8 +586,12 @@ time_strftime(PyObject *self, PyObject *args)
if (_PyTime_localtime(tt, &buf) != 0)
return NULL;
}
- else if (!gettmarg(tup, &buf) || !checktm(&buf))
+ else if (!gettmarg(tup, &buf,
+ "iiiiiiiii;strftime(): illegal time tuple argument") ||
+ !checktm(&buf))
+ {
return NULL;
+ }
#if defined(_MSC_VER) || defined(sun) || defined(_AIX)
if (buf.tm_year + 1900 < 1 || 9999 < buf.tm_year + 1900) {
@@ -776,9 +780,13 @@ time_asctime(PyObject *self, PyObject *args)
time_t tt = time(NULL);
if (_PyTime_localtime(tt, &buf) != 0)
return NULL;
-
- } else if (!gettmarg(tup, &buf) || !checktm(&buf))
+ }
+ else if (!gettmarg(tup, &buf,
+ "iiiiiiiii;asctime(): illegal time tuple argument") ||
+ !checktm(&buf))
+ {
return NULL;
+ }
return _asctime(&buf);
}
@@ -814,8 +822,11 @@ time_mktime(PyObject *self, PyObject *tup)
{
struct tm buf;
time_t tt;
- if (!gettmarg(tup, &buf))
+ if (!gettmarg(tup, &buf,
+ "iiiiiiiii;mktime(): illegal time tuple argument"))
+ {
return NULL;
+ }
#ifdef _AIX
/* year < 1902 or year > 2037 */
if (buf.tm_year < 2 || buf.tm_year > 137) {
More information about the Python-checkins
mailing list