mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 17:25:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make sure filter() never returns tuple, str or unicode

Browse source 
subclasses. (Discussed in SF patch #665835)
This commit is contained in:
Walter Dörwald 2003-02-04 20:24:45 +00:00
parent 29273c87da
commit c3da83fcd7
2 changed files with 45 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Python/bltinmodule.c
View file

@ -1838,7 +1838,10 @@ filtertuple(PyObject *func, PyObject *tuple)
int len = PyTuple_Size(tuple);
if (len == 0) {
Py_INCREF(tuple);
if (PyTuple_CheckExact(tuple))
Py_INCREF(tuple);
else
tuple = PyTuple_New(0);
return tuple;
}
@ -1895,8 +1898,15 @@ filterstring(PyObject *func, PyObject *strobj)
int outlen = len;
if (func == Py_None) {
/* No character is ever false -- share input string */
Py_INCREF(strobj);
/* No character is ever false -- share input string
* (if it's not a subclass) */
if (PyString_CheckExact(strobj))
Py_INCREF(strobj);
else
strobj = PyString_FromStringAndSize(
PyString_AS_STRING(strobj),
len
);
return strobj;
}
if ((result = PyString_FromStringAndSize(NULL, len)) == NULL)
@ -1980,8 +1990,15 @@ filterunicode(PyObject *func, PyObject *strobj)
int outlen = len;
if (func == Py_None) {
/* No character is ever false -- share input string */
Py_INCREF(strobj);
/* No character is ever false -- share input string
* (it if's not a subclass) */
if (PyUnicode_CheckExact(strobj))
Py_INCREF(strobj);
else
strobj = PyUnicode_FromUnicode(
PyUnicode_AS_UNICODE(strobj),
len
);
return strobj;
}
if ((result = PyUnicode_FromUnicode(NULL, len)) == NULL)