merge 3.2

e8eb0e82 · Benjamin Peterson · e0bcca51 · 4bb867d3 · e8eb0e82
Kaydet (Commit) e8eb0e82 authored Kas 23, 2011 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

posixmodule.c Modules/posixmodule.c +5 -1

No files found.
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -7844,12 +7844,16 @@ posix_unsetenv(PyObject *self, PyObject *args)
    int err;

    if (!PyArg_ParseTuple(args, "O&:unsetenv",
+
                          PyUnicode_FSConverter, &name))
        return NULL;

+
    err = unsetenv(PyBytes_AS_STRING(name));
-    if (err)
+    if (err) {
+        Py_DECREF(name);
        return posix_error();
+    }

    /* Remove the key from posix_putenv_garbage;
     * this will cause it to be collected.  This has to