fix PYTHONWARNINGS handling to not modify the original env value and improve
its tests
diff --git a/Modules/main.c b/Modules/main.c
index 0ba01f7..11ac97e 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -421,14 +421,19 @@
(p = Py_GETENV("PYTHONNOUSERSITE")) && *p != '\0')
Py_NoUserSiteDirectory = 1;
- if ((p = Py_GETENV("PYTHONWARNINGS")) && *p != '\0')
- {
- char* warning = strtok(p, ",");
- while (warning != NULL)
- {
+ if ((p = Py_GETENV("PYTHONWARNINGS")) && *p != '\0') {
+ char *buf, *warning;
+
+ buf = (char *)malloc(strlen(p) + 1);
+ if (buf == NULL)
+ Py_FatalError(
+ "not enough memory to copy PYTHONWARNINGS");
+ strcpy(buf, p);
+ for (warning = strtok(buf, ",");
+ warning != NULL;
+ warning = strtok(NULL, ","))
PySys_AddWarnOption(warning);
- warning = strtok(NULL, ",");
- }
+ free(buf);
}
if (command == NULL && module == NULL && _PyOS_optind < argc &&