]> granicus.if.org Git - python/commitdiff
Ensure path is initialized to prevent freeing random memory
authorNeal Norwitz <nnorwitz@gmail.com>
Wed, 9 Jun 2004 01:46:02 +0000 (01:46 +0000)
committerNeal Norwitz <nnorwitz@gmail.com>
Wed, 9 Jun 2004 01:46:02 +0000 (01:46 +0000)
(reported by Thomas Heller).  If have_unicode_filename is set,
path looks like it will not be used, so there's no need to free it.

Modules/posixmodule.c

index 599d88a380a15a2ed972e6f7574c130954c0bf5e..a375dcb6f534020814834e76d57f360b090ed808 100644 (file)
@@ -1994,7 +1994,7 @@ second form is used, set the access and modified times to the current time.");
 static PyObject *
 posix_utime(PyObject *self, PyObject *args)
 {
-       char *path;
+       char *path = NULL;
        long atime, mtime, ausec, musec;
        int res;
        PyObject* arg;
@@ -2087,10 +2087,8 @@ posix_utime(PyObject *self, PyObject *args)
        }
        if (res < 0) {
 #ifdef Py_WIN_WIDE_FILENAMES
-               if (have_unicode_filename) {
-                       PyMem_Free(path);
+               if (have_unicode_filename)
                        return posix_error_with_unicode_filename(wpath);
-               }
 #endif /* Py_WIN_WIDE_FILENAMES */
                return posix_error_with_allocated_filename(path);
        }