mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 03:05:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames

Browse source
This commit is contained in:
Victor Stinner 2010-04-23 10:56:17 +00:00
parent 13daf12b47
commit 349fd52111
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -329,6 +329,8 @@ C-API
Library
-------
- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames
- Issue #8451: Syslog module now uses basename(sys.argv[0]) instead of
the string "python" as the *ident*. openlog() arguments are all optional
and keywords.

10
Modules/bz2module.c
View file

@ -1162,6 +1162,7 @@ BZ2File_init(BZ2FileObject *self, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = {"filename", "mode", "buffering",
"compresslevel", 0};
PyObject *name_obj = NULL;
char *name;
char *mode = "r";
int buffering = -1;
@ -1171,14 +1172,17 @@ BZ2File_init(BZ2FileObject *self, PyObject *args, PyObject *kwargs)
self->size = -1;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|sii:BZ2File",
kwlist, &name, &mode, &buffering,
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O&|sii:BZ2File",
kwlist, PyUnicode_FSConverter, &name_obj,
&mode, &buffering,
&compresslevel))
return -1;
name = PyBytes_AsString(name_obj);
if (compresslevel < 1 || compresslevel > 9) {
PyErr_SetString(PyExc_ValueError,
"compresslevel must be between 1 and 9");
Py_DECREF(name_obj);
return -1;
}
@ -1202,6 +1206,7 @@ BZ2File_init(BZ2FileObject *self, PyObject *args, PyObject *kwargs)
if (error) {
PyErr_Format(PyExc_ValueError,
"invalid mode char %c", *mode);
Py_DECREF(name_obj);
return -1;
}
mode++;
@ -1216,6 +1221,7 @@ BZ2File_init(BZ2FileObject *self, PyObject *args, PyObject *kwargs)
mode = (mode_char == 'r') ? "rb" : "wb";
self->rawfp = fopen(name, mode);
Py_DECREF(name_obj);
if (self->rawfp == NULL) {
PyErr_SetFromErrno(PyExc_IOError);
return -1;