bpo-32922: dbm.open() now encodes filename with the filesystem encoding. (GH-5832)
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
index 7e13441..8afd92c 100644
--- a/Modules/_dbmmodule.c
+++ b/Modules/_dbmmodule.c
@@ -412,7 +412,7 @@
_dbm.open as dbmopen
- filename: str
+ filename: unicode
The filename to open.
flags: str="r"
@@ -429,9 +429,9 @@
[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 @@
"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[] = {