diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-08-23 10:04:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 10:04:16 (GMT) |
| commit | c48682509dc49b43fe914fe6c502bc390345d1c2 (patch) | |
| tree | 2558ec6d9de1ec6575d03bdd41843b108d59278a | |
| parent | d288b29fc652d27191bde3b3c9145c2eb8169929 (diff) | |
| download | cpython-c48682509dc49b43fe914fe6c502bc390345d1c2.zip cpython-c48682509dc49b43fe914fe6c502bc390345d1c2.tar.gz cpython-c48682509dc49b43fe914fe6c502bc390345d1c2.tar.bz2 | |
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.
| -rw-r--r-- | Misc/NEWS.d/next/C API/2019-08-23-11-35-55.bpo-37926.hnI5IQ.rst | 1 | ||||
| -rw-r--r-- | Python/sysmodule.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/C API/2019-08-23-11-35-55.bpo-37926.hnI5IQ.rst b/Misc/NEWS.d/next/C API/2019-08-23-11-35-55.bpo-37926.hnI5IQ.rst new file mode 100644 index 0000000..2018533 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2019-08-23-11-35-55.bpo-37926.hnI5IQ.rst @@ -0,0 +1 @@ +Fix a crash in ``PySys_SetArgvEx(0, NULL, 0)``. diff --git a/Python/sysmodule.c b/Python/sysmodule.c index a89ebce..738bbc8 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; } |