8000 gh-94930: skipitem() in getargs.c should return non-NULL on error (GH… · python/cpython@067f0da · GitHub
[go: up one dir, main page]
Skip to content

Commit 067f0da

Browse files
serhiy-storchakaserhiy-storchaka
authored
gh-94930: skipitem() in getargs.c should return non-NULL on error (GH-94931)
1 parent 2f8bff6 commit 067f0da

File tree

4 files changed

+37
-8
lines changed

4 files changed

+37
-8
lines changed

‎Lib/test/test_getargs2.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -877,9 +877,19 @@ def test_s_hash(self):
877877
def test_s_hash_int(self):
878878
# "s#" without PY_SSIZE_T_CLEAN defined.
879879
from _testcapi import getargs_s_hash_int
880-
self.assertRaises(SystemError, getargs_s_hash_int, "abc")
881-
self.assertRaises(SystemError, getargs_s_hash_int, x=42)
882-
# getargs_s_hash_int() don't raise SystemError because skipitem() is not called.
880+
from _testcapi import getargs_s_hash_int2
881+
buf = bytearray([1, 2])
882+
self.assertRaises(SystemError, getargs_s_hash_int, buf, "abc")
883+
self.assertRaises(SystemError, getargs_s_hash_int, buf, x=42)
884+
self.assertRaises(SystemError, getargs_s_hash_int, buf, x="abc")
885+
self.assertRaises(SystemError, getargs_s_hash_int2, buf, ("abc",))
886+
self.assertRaises(SystemError, getargs_s_hash_int2, buf, x=42)
887+
self.assertRaises(SystemError, getargs_s_hash_int2, buf, x="abc")
888+
buf.append(3) # still mutable -- not locked by a buffer export
889+
# getargs_s_hash_int(buf) may not raise SystemError because skipitem()
890+
# is not called. But it is an implementation detail.
891+
# getargs_s_hash_int(buf)
892+
# getargs_s_hash_int2(buf)
883893

884894
def test_z(self):
885895
from _testcapi import getargs_z

‎Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix ``SystemError`` raised when :c:func:`PyArg_ParseTupleAndKeywords` is
2+
used with ``#`` in ``(...)`` but without ``PY_SSIZE_T_CLEAN`` defined.

‎Modules/_testcapimodule.c

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6035,6 +6035,7 @@ test_macros(PyObject *self, PyObject *Py_UNUSED(args))
60356035
static PyObject *negative_dictoffset(PyObject *, PyObject *);
60366036
static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
60376037
static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
6038+
static PyObject *getargs_s_hash_int2(PyObject *, PyObject *, PyObject*);
60386039

60396040
static PyMethodDef TestMethods[] = {
60406041
{"raise_exception", raise_exception, METH_VARARGS},
@@ -6157,6 +6158,8 @@ static PyMethodDef TestMethods[] = {
61576158
{"getargs_s_hash", getargs_s_hash, METH_VARARGS},
61586159
{"getargs_s_hash_int", _PyCFunction_CAST(getargs_s_hash_int),
61596160
METH_VARARGS|METH_KEYWORDS},
6161+
{"getargs_s_hash_int2", _PyCFunction_CAST(getargs_s_hash_int2),
6162+
METH_VARARGS|METH_KEYWORDS},
61606163
{"getargs_z", getargs_z, METH_VARARGS},
61616164
{"getargs_z_star", getargs_z_star, METH_VARARGS},
61626165
{"getargs_z_hash", getargs_z_hash, METH_VARARGS},
@@ -7794,11 +7797,27 @@ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
77947797
static PyObject *
77957798
getargs_s_hash_int(PyObject *self, PyObject *args, PyObject *kwargs)
77967799
{
7797-
static char *keywords[] = {"", "x", NULL};
7800+
static char *keywords[] = {"", "", "x", NULL};
7801+
Py_buffer buf = {NULL};
7802+
const char *s;
7803+
int len;
7804+
int i = 0;
7805+
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "w*|s#i", keywords, &buf, &s, &len, &i))
7806+
return NULL;
7807+
PyBuffer_Release(&buf);
7808+
Py_RETURN_NONE;
7809+
}
7810+
7811+
static PyObject *
7812+
getargs_s_hash_int2(PyObject *self, PyObject *args, PyObject *kwargs)
7813+
{
7814+
static char *keywords[] = {"", "", "x", NULL};
7815+
Py_buffer buf = {NULL};
77987816
const char *s;
77997817
int len;
78007818
int i = 0;
7801-
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s#i", keywords, &s, &len, &i))
7819+
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "w*|(s#)i", keywords, &buf, &s, &len, &i))
78027820
return NULL;
7821+
PyBuffer_Release(&buf);
78037822
Py_RETURN_NONE;
78047823
}

‎Python/getargs.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,9 +2641,7 @@ skipitem(const char **p_format, va_list *p_va, int flags)
26412641
if (*format == '#') {
26422642
if (p_va != NULL) {
26432643
if (!(flags & FLAG_SIZE_T)) {
2644-
PyErr_SetString(PyExc_SystemError,
2645-
"PY_SSIZE_T_CLEAN macro must be defined for '#' formats");
2646-
return NULL;
2644+
return "PY_SSIZE_T_CLEAN macro must be defined for '#' formats";
26472645
}
26482646
(void) va_arg(*p_va, Py_ssize_t *);
26492647
}

0 commit comments

Comments
 (0)
0