traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

posix.confname(): enforce that names as str instances.

This commit is contained in:
Guido van Rossum 2007-08-27 23:24:46 +00:00
parent 26d95c3d07
commit 7d5baac81c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/posixmodule.c
View File

@ -5441,7 +5441,7 @@ struct constdef {
static int
conv_confname(PyObject *arg, int *valuep, struct constdef *table,
size_t tablesize)
size_t tablesize)
{
if (PyInt_Check(arg)) {
*valuep = PyInt_AS_LONG(arg);
@ -5450,16 +5450,20 @@ conv_confname(PyObject *arg, int *valuep, struct constdef *table,
else {
/* look up the value in the table using a binary search */
size_t lo = 0;
size_t mid;
size_t mid;
size_t hi = tablesize;
int cmp;
const char *confname;
Py_ssize_t namelen;
if (PyObject_AsCharBuffer(arg, &confname, &namelen) < 0) {
if (!PyUnicode_Check(arg)) {
PyErr_SetString(PyExc_TypeError,
"configuration names must be strings or integers");
return 0;
}
confname = PyUnicode_AsString(arg);
if (confname == NULL)
return 0;
namelen = strlen(confname);
while (lo < hi) {
mid = (lo + hi) / 2;
cmp = strcmp(confname, table[mid].name);