bpo-39406: os.putenv() avoids putenv_dict on Windows (GH-18126)

vstinner · web-flow · commit 0852c7dd52ac · 2020-01-22T21:53:26.000+01:00
Windows: _wputenv(env) copies the *env* string and doesn't require
the caller to manage the variable memory.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -819,7 +819,9 @@ dir_fd_converter(PyObject *o, void *p)
     }
 }
 
-#ifdef HAVE_PUTENV
+/* Windows: _wputenv(env) copies the *env* string and doesn't require the
+   caller to manage the variable memory. */
+#if defined(HAVE_PUTENV) && !defined(MS_WINDOWS)
 #  define PY_PUTENV_DICT
 #endif
 
@@ -10130,8 +10132,10 @@ os_putenv_impl(PyObject *module, PyObject *name, PyObject *value)
         posix_error();
         goto error;
     }
+    /* _wputenv(env) copies the *env* string and doesn't require the caller
+       to manage the variable memory. */
+    Py_DECREF(unicode);
 
-    posix_putenv_dict_setitem(name, unicode);
     Py_RETURN_NONE;
 
 error:

Original file line number	Diff line number	Diff line change
`@@ -819,7 +819,9 @@ dir_fd_converter(PyObject o, void p)`
`819`	`819`	`}`
`820`	`820`	`}`
`821`	`821`
`822`		`-#ifdef HAVE_PUTENV`
	`822`	`+/* Windows: _wputenv(env) copies the env string and doesn't require the`
	`823`	`+ caller to manage the variable memory. */`
	`824`	`+#if defined(HAVE_PUTENV) && !defined(MS_WINDOWS)`
`823`	`825`	`# define PY_PUTENV_DICT`
`824`	`826`	`#endif`
`825`	`827`
`@@ -10130,8 +10132,10 @@ os_putenv_impl(PyObject module, PyObject name, PyObject *value)`
`10130`	`10132`	`posix_error();`
`10131`	`10133`	`goto error;`
`10132`	`10134`	`}`
	`10135`	`+ /* _wputenv(env) copies the env string and doesn't require the caller`
	`10136`	`+ to manage the variable memory. */`
	`10137`	`+ Py_DECREF(unicode);`
`10133`	`10138`
`10134`		`- posix_putenv_dict_setitem(name, unicode);`
`10135`	`10139`	`Py_RETURN_NONE;`
`10136`	`10140`
`10137`	`10141`	`error:`