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

Plug a few memory leaks in utime(). path is allocated from within 

PyArg_ParseTuple() since the format is "et"  This change should
be reviewed carefully.

Bugfix candidate.
This commit is contained in:
Neal Norwitz 2004-06-06 20:40:27 +00:00
parent c28e7ad3d0
commit 9665271f92
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/posixmodule.c
View File

@ -2049,15 +2049,20 @@ posix_utime(PyObject *self, PyObject *args)
else if (!PyTuple_Check(arg) || PyTuple_Size(arg) != 2) {
PyErr_SetString(PyExc_TypeError,
"utime() arg 2 must be a tuple (atime, mtime)");
PyMem_Free(path);
return NULL;
}
else {
if (extract_time(PyTuple_GET_ITEM(arg, 0),
&atime, &ausec) == -1)
&atime, &ausec) == -1) {
PyMem_Free(path);
return NULL;
}
if (extract_time(PyTuple_GET_ITEM(arg, 1),
&mtime, &musec) == -1)
&mtime, &musec) == -1) {
PyMem_Free(path);
return NULL;
}
ATIME = atime;
MTIME = mtime;
#ifdef HAVE_UTIMES
@ -2082,11 +2087,14 @@ posix_utime(PyObject *self, PyObject *args)
}
if (res < 0) {
#ifdef Py_WIN_WIDE_FILENAMES
if (have_unicode_filename)
if (have_unicode_filename) {
PyMem_Free(path);
return posix_error_with_unicode_filename(wpath);
#endif /* Py_WIN_WIDE_FILENAMES */
return posix_error_with_filename(path);
}
#endif /* Py_WIN_WIDE_FILENAMES */
return posix_error_with_allocated_filename(path);
}
PyMem_Free(path);
Py_INCREF(Py_None);
return Py_None;
#undef UTIME_ARG