From c48682509dc49b43fe914fe6c502bc390345d1c2 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 23 Aug 2019 11:04:16 +0100 Subject: bpo-37926: Fix PySys_SetArgvEx(0, NULL, 0) crash (GH-15415) empty_argv is no longer static in Python 3.8, but it is declared in a temporary scope, whereas argv keeps a reference to it. empty_argv memory (allocated on the stack) is reused by make_sys_argv() code which is inlined when using gcc -O3. Define empty_argv in PySys_SetArgvEx() body, to ensure that it remains valid for the whole lifetime of the PySys_SetArgvEx() call. --- Python/sysmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Python/sysmodule.c') diff --git a/Python/sysmodule.c b/Python/sysmodule.c index a89ebceb66c..738bbc826f5 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -3058,11 +3058,11 @@ make_sys_argv(int argc, wchar_t * const * argv) void PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath) { + wchar_t* empty_argv[1] = {L""}; PyThreadState *tstate = _PyThreadState_GET(); if (argc < 1 || argv == NULL) { /* Ensure at least one (empty) argument is seen */ - wchar_t* empty_argv[1] = {L""}; argv = empty_argv; argc = 1; } -- cgit v1.2.3