Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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:
Neal Norwitz 2006-03-14 06:02:16 +00:00
parent 3daf75878d
commit 7580146b5c
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/xxmodule.c
View File

@ -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 */
};

12
Objects/object.c
View File

@ -400,10 +400,16 @@ PyObject_Unicode(PyObject *v)
{
PyObject *res;
PyObject *func;
PyObject *str;
static PyObject *unicodestr;
if (v == NULL) {
res = PyString_FromString("<NULL>");
if (res == NULL)
return NULL;
str = PyUnicode_FromEncodedObject(res, NULL, "strict");
Py_DECREF(res);
return str;
} else if (PyUnicode_CheckExact(v)) {
Py_INCREF(v);
return v;
@ -443,13 +449,9 @@ PyObject_Unicode(PyObject *v)
if (res == NULL)
return NULL;
if (!PyUnicode_Check(res)) {
PyObject *str;
str = PyUnicode_FromEncodedObject(res, NULL, "strict");
Py_DECREF(res);
if (str)
res = str;
else
return NULL;
res = str;
}
return res;
}