diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-02-21 20:42:48 +0100 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-02-21 20:42:48 +0100 |
| commit | cc3fa88a9c9c371a310673cfea3752a0beb25dac (patch) | |
| tree | f0d922f2156b1b77d88f700becc0768508f8ef71 /Modules/main.c | |
| parent | a1b2af8034e1da367778de18872f7a1cddcc524e (diff) | |
| download | cpython-git-cc3fa88a9c9c371a310673cfea3752a0beb25dac.tar.gz | |
Fix crash at startup with -W options.
Diffstat (limited to 'Modules/main.c')
| -rw-r--r-- | Modules/main.c | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/Modules/main.c b/Modules/main.c index 824badafbe..b57241ea43 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -262,7 +262,33 @@ Py_Main(int argc, char **argv) Py_RISCOSWimpFlag = 0; #endif + /* Hash randomization needed early for all string operations + (including -W and -X options). */ + while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) { + if (c == 'm' || c == 'c') { + /* -c / -m is the last option: following arguments are + not interpreter options. */ + break; + } + switch (c) { + case 'E': + Py_IgnoreEnvironmentFlag++; + break; + case 'R': + Py_HashRandomizationFlag++; + break; + } + } + /* The variable is only tested for existence here; _PyRandom_Init will + check its value further. */ + if (!Py_HashRandomizationFlag && + (p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0') + Py_HashRandomizationFlag = 1; + + _PyRandom_Init(); + PySys_ResetWarnOptions(); + _PyOS_ResetGetOpt(); while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) { if (c == 'c') { @@ -356,7 +382,7 @@ Py_Main(int argc, char **argv) break; case 'E': - Py_IgnoreEnvironmentFlag++; + /* Already handled above */ break; case 't': @@ -406,7 +432,7 @@ Py_Main(int argc, char **argv) break; case 'R': - Py_HashRandomizationFlag++; + /* Already handled above */ break; /* This space reserved for other options */ |