mirror of
https://github.com/python/cpython.git
synced 2025-08-04 17:08:35 +00:00
Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and
PyObject_Unicode(). This problem was originally reported from Coverity and addresses mail on python-dev "checkin r43015". This inlines the conversion of the string to unicode and cleans up/simplifies some code at the end of the PyObject_Unicode(). We really need a complete C API test module for all public APIs and passing good and bad parameter values. Will backport.
This commit is contained in:
parent
3daf75878d
commit
7580146b5c
2 changed files with 21 additions and 5 deletions
|
@ -197,6 +197,18 @@ xx_bug(PyObject *self, PyObject *args)
|
|||
return Py_None;
|
||||
}
|
||||
|
||||
/* Example passing NULLs to PyObject_Str(NULL) and PyObject_Unicode(NULL). */
|
||||
|
||||
static PyObject *
|
||||
xx_null(PyObject *self, PyObject *noargs)
|
||||
{
|
||||
PyObject *o1 = PyObject_Str(NULL), *o2 = PyObject_Unicode(NULL);
|
||||
PyObject *tuple = PyTuple_Pack(2, o1, o2);
|
||||
Py_XDECREF(o1);
|
||||
Py_XDECREF(o2);
|
||||
return tuple;
|
||||
}
|
||||
|
||||
/* Test bad format character */
|
||||
|
||||
static PyObject *
|
||||
|
@ -331,6 +343,8 @@ static PyMethodDef xx_methods[] = {
|
|||
PyDoc_STR("new() -> new Xx object")},
|
||||
{"bug", xx_bug, METH_VARARGS,
|
||||
PyDoc_STR("bug(o) -> None")},
|
||||
{"null", xx_null, METH_NOARGS,
|
||||
PyDoc_STR("null(o) -> ('NULL', u'NULL')")},
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue