Skip to content

bpo-36496: Fix two possible uninitialized reads #12644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bradlarsen wants to merge 1 commit into from
+7 −7
Closed

bpo-36496: Fix two possible uninitialized reads #12644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Python/preconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,13 @@ _PyPreConfig_Read(_PyPreConfig *config, const _PyArgv *args)
/* Set LC_CTYPE to the user preferred locale */
_Py_SetLocaleFromEnv(LC_CTYPE);

int init_utf8_mode = Py_UTF8Mode;
#ifdef MS_WINDOWS
int init_legacy_encoding = Py_LegacyWindowsFSEncodingFlag;
#endif
int locale_coerced = 0;
int loops = 0;

_PyPreCmdline cmdline = _PyPreCmdline_INIT;
if (args) {
err = _PyPreCmdline_SetArgv(&cmdline, args);
Expand All @@ -727,13 +734,6 @@ _PyPreConfig_Read(_PyPreConfig *config, const _PyArgv *args)
}
}

int init_utf8_mode = Py_UTF8Mode;
#ifdef MS_WINDOWS
int init_legacy_encoding = Py_LegacyWindowsFSEncodingFlag;
#endif
int locale_coerced = 0;
int loops = 0;

while (1) {
int utf8_mode = config->utf8_mode;

Expand Down