diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-03 01:46:38 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-03 01:46:38 (GMT) |
| commit | bde0c9db80db8abe0489b4f96ff88e06890d8787 (patch) | |
| tree | 2ab2e16b333f060708e4b93fd9f83a92ac1ad80c /Modules/_testcapimodule.c | |
| parent | 05609eff8a6d02753b8a177560998034f28efb5d (diff) | |
| download | cpython-bde0c9db80db8abe0489b4f96ff88e06890d8787.zip cpython-bde0c9db80db8abe0489b4f96ff88e06890d8787.tar.gz cpython-bde0c9db80db8abe0489b4f96ff88e06890d8787.tar.bz2 | |
Merged revisions 79645 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r79645 | benjamin.peterson | 2010-04-02 20:40:24 -0500 (Fri, 02 Apr 2010) | 13 lines
Merged revisions 79642,79644 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79642 | benjamin.peterson | 2010-04-02 20:08:34 -0500 (Fri, 02 Apr 2010) | 1 line
split out large test function
........
r79644 | benjamin.peterson | 2010-04-02 20:28:57 -0500 (Fri, 02 Apr 2010) | 1 line
give TypeError when trying to set T_STRING_INPLACE
........
................
Diffstat (limited to 'Modules/_testcapimodule.c')
| -rw-r--r-- | Modules/_testcapimodule.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 2d88175..0def230 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -1672,6 +1672,7 @@ typedef struct { unsigned long ulong_member; float float_member; double double_member; + char inplace_member[5]; #ifdef HAVE_LONG_LONG PY_LONG_LONG longlong_member; unsigned PY_LONG_LONG ulonglong_member; @@ -1695,6 +1696,7 @@ static struct PyMemberDef test_members[] = { {"T_ULONG", T_ULONG, offsetof(test_structmembers, structmembers.ulong_member), 0, NULL}, {"T_FLOAT", T_FLOAT, offsetof(test_structmembers, structmembers.float_member), 0, NULL}, {"T_DOUBLE", T_DOUBLE, offsetof(test_structmembers, structmembers.double_member), 0, NULL}, + {"T_STRING_INPLACE", T_STRING_INPLACE, offsetof(test_structmembers, structmembers.inplace_member), 0, NULL}, #ifdef HAVE_LONG_LONG {"T_LONGLONG", T_LONGLONG, offsetof(test_structmembers, structmembers.longlong_member), 0, NULL}, {"T_ULONGLONG", T_ULONGLONG, offsetof(test_structmembers, structmembers.ulonglong_member), 0, NULL}, @@ -1709,17 +1711,19 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) static char *keywords[] = { "T_BOOL", "T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT", "T_INT", "T_UINT", "T_LONG", "T_ULONG", - "T_FLOAT", "T_DOUBLE", + "T_FLOAT", "T_DOUBLE", "T_INPLACE_STRING", #ifdef HAVE_LONG_LONG "T_LONGLONG", "T_ULONGLONG", #endif NULL}; - static char *fmt = "|bbBhHiIlkfd" + static char *fmt = "|bbBhHiIlkfds#" #ifdef HAVE_LONG_LONG "LK" #endif ; test_structmembers *ob; + const char *s; + Py_ssize_t string_len = 0; ob = PyObject_New(test_structmembers, type); if (ob == NULL) return NULL; @@ -1735,7 +1739,8 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) &ob->structmembers.long_member, &ob->structmembers.ulong_member, &ob->structmembers.float_member, - &ob->structmembers.double_member + &ob->structmembers.double_member, + &s, &string_len #ifdef HAVE_LONG_LONG , &ob->structmembers.longlong_member, &ob->structmembers.ulonglong_member @@ -1744,6 +1749,12 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) Py_DECREF(ob); return NULL; } + if (string_len > 5) { + Py_DECREF(ob); + PyErr_SetString(PyExc_ValueError, "string too long"); + return NULL; + } + strcpy(ob->structmembers.inplace_member, s); return (PyObject *)ob; } |