Fix crash at startup with -W options.
This commit is contained in:
parent
a1b2af8034
commit
cc3fa88a9c
|
@ -9,6 +9,7 @@ PyAPI_DATA(int) _PyOS_opterr;
|
||||||
PyAPI_DATA(int) _PyOS_optind;
|
PyAPI_DATA(int) _PyOS_optind;
|
||||||
PyAPI_DATA(char *) _PyOS_optarg;
|
PyAPI_DATA(char *) _PyOS_optarg;
|
||||||
|
|
||||||
|
PyAPI_FUNC(void) _PyOS_ResetGetOpt(void);
|
||||||
PyAPI_FUNC(int) _PyOS_GetOpt(int argc, char **argv, char *optstring);
|
PyAPI_FUNC(int) _PyOS_GetOpt(int argc, char **argv, char *optstring);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -128,6 +128,7 @@ PyAPI_FUNC(int) _PyInt_Init(void);
|
||||||
PyAPI_FUNC(int) _PyLong_Init(void);
|
PyAPI_FUNC(int) _PyLong_Init(void);
|
||||||
PyAPI_FUNC(void) _PyFloat_Init(void);
|
PyAPI_FUNC(void) _PyFloat_Init(void);
|
||||||
PyAPI_FUNC(int) PyByteArray_Init(void);
|
PyAPI_FUNC(int) PyByteArray_Init(void);
|
||||||
|
PyAPI_FUNC(void) _PyRandom_Init(void);
|
||||||
|
|
||||||
/* Various internal finalizers */
|
/* Various internal finalizers */
|
||||||
PyAPI_FUNC(void) _PyExc_Fini(void);
|
PyAPI_FUNC(void) _PyExc_Fini(void);
|
||||||
|
|
|
@ -262,7 +262,33 @@ Py_Main(int argc, char **argv)
|
||||||
Py_RISCOSWimpFlag = 0;
|
Py_RISCOSWimpFlag = 0;
|
||||||
#endif
|
#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();
|
PySys_ResetWarnOptions();
|
||||||
|
_PyOS_ResetGetOpt();
|
||||||
|
|
||||||
while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) {
|
while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) {
|
||||||
if (c == 'c') {
|
if (c == 'c') {
|
||||||
|
@ -356,7 +382,7 @@ Py_Main(int argc, char **argv)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'E':
|
case 'E':
|
||||||
Py_IgnoreEnvironmentFlag++;
|
/* Already handled above */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 't':
|
case 't':
|
||||||
|
@ -406,7 +432,7 @@ Py_Main(int argc, char **argv)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'R':
|
case 'R':
|
||||||
Py_HashRandomizationFlag++;
|
/* Already handled above */
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* This space reserved for other options */
|
/* This space reserved for other options */
|
||||||
|
|
|
@ -37,10 +37,18 @@ extern "C" {
|
||||||
int _PyOS_opterr = 1; /* generate error messages */
|
int _PyOS_opterr = 1; /* generate error messages */
|
||||||
int _PyOS_optind = 1; /* index into argv array */
|
int _PyOS_optind = 1; /* index into argv array */
|
||||||
char *_PyOS_optarg = NULL; /* optional argument */
|
char *_PyOS_optarg = NULL; /* optional argument */
|
||||||
|
static char *opt_ptr = "";
|
||||||
|
|
||||||
|
void _PyOS_ResetGetOpt(void)
|
||||||
|
{
|
||||||
|
_PyOS_opterr = 1;
|
||||||
|
_PyOS_optind = 1;
|
||||||
|
_PyOS_optarg = NULL;
|
||||||
|
opt_ptr = "";
|
||||||
|
}
|
||||||
|
|
||||||
int _PyOS_GetOpt(int argc, char **argv, char *optstring)
|
int _PyOS_GetOpt(int argc, char **argv, char *optstring)
|
||||||
{
|
{
|
||||||
static char *opt_ptr = "";
|
|
||||||
char *ptr;
|
char *ptr;
|
||||||
int option;
|
int option;
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,6 @@ static void call_sys_exitfunc(void);
|
||||||
static void call_ll_exitfuncs(void);
|
static void call_ll_exitfuncs(void);
|
||||||
extern void _PyUnicode_Init(void);
|
extern void _PyUnicode_Init(void);
|
||||||
extern void _PyUnicode_Fini(void);
|
extern void _PyUnicode_Fini(void);
|
||||||
extern void _PyRandom_Init(void);
|
|
||||||
|
|
||||||
#ifdef WITH_THREAD
|
#ifdef WITH_THREAD
|
||||||
extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *);
|
extern void _PyGILState_Init(PyInterpreterState *, PyThreadState *);
|
||||||
|
|
Loading…
Reference in New Issue