mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-32922: dbm.open() now encodes filename with the filesystem encoding. (GH-5832)

Browse source
This commit is contained in:
Serhiy Storchaka 2018-02-26 16:02:22 +02:00 • committed by GitHub
parent 973cae07d6
commit 6f600ff173
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 134 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Modules/_dbmmodule.c
View file

@ -412,7 +412,7 @@ static PyTypeObject Dbmtype = {
_dbm.open as dbmopen
filename: str
filename: unicode
The filename to open.
flags: str="r"
@ -429,9 +429,9 @@ Return a database object.
[clinic start generated code]*/
static PyObject *
dbmopen_impl(PyObject *module, const char *filename, const char *flags,
dbmopen_impl(PyObject *module, PyObject *filename, const char *flags,
int mode)
/*[clinic end generated code: output=5fade8cf16e0755f input=226334bade5764e6]*/
/*[clinic end generated code: output=9527750f5df90764 input=376a9d903a50df59]*/
{
int iflags;
@ -450,7 +450,20 @@ dbmopen_impl(PyObject *module, const char *filename, const char *flags,
"arg 2 to open should be 'r', 'w', 'c', or 'n'");
return NULL;
}
return newdbmobject(filename, iflags, mode);
PyObject *filenamebytes = PyUnicode_EncodeFSDefault(filename);
if (filenamebytes == NULL) {
return NULL;
}
const char *name = PyBytes_AS_STRING(filenamebytes);
if (strlen(name) != (size_t)PyBytes_GET_SIZE(filenamebytes)) {
Py_DECREF(filenamebytes);
PyErr_SetString(PyExc_ValueError, "embedded null character");
return NULL;
}
PyObject *self = newdbmobject(name, iflags, mode);
Py_DECREF(filenamebytes);
return self;
}
static PyMethodDef dbmmodule_methods[] = {