diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-08-23 11:22:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 11:22:14 (GMT) |
| commit | ca9ae94a2aba35d94ac1ec081f9bcac3a13aebd3 (patch) | |
| tree | e4fa80ff4ed455e5a19540c7f2b6da5b71a90aad /Python | |
| parent | 994925b2cb28d5a77c9bdf056b6fdf99838fd848 (diff) | |
| download | cpython-ca9ae94a2aba35d94ac1ec081f9bcac3a13aebd3.zip cpython-ca9ae94a2aba35d94ac1ec081f9bcac3a13aebd3.tar.gz cpython-ca9ae94a2aba35d94ac1ec081f9bcac3a13aebd3.tar.bz2 | |
bpo-37926: Fix PySys_SetArgvEx(0, NULL, 0) crash (GH-15415) (GH-15420)
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.
(cherry picked from commit c48682509dc49b43fe914fe6c502bc390345d1c2)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/sysmodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 6a49d89..577b6fb 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -3080,9 +3080,10 @@ 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""}; + if (argc < 1 || argv == NULL) { /* Ensure at least one (empty) argument is seen */ - wchar_t* empty_argv[1] = {L""}; argv = empty_argv; argc = 1; } |