Skip to content

bpo-34207: Fix pymain_init_cmdline_argv() #8867

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
wants to merge 1 commit into from
Closed

bpo-34207: Fix pymain_init_cmdline_argv() #8867

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions Include/fileutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ PyAPI_FUNC(char*) _Py_EncodeLocaleRaw(
#endif

#ifdef Py_BUILD_CORE
PyAPI_FUNC(wchar_t *) _Py_DecodeUTF8(
const char *arg,
size_t *size);

PyAPI_FUNC(int) _Py_DecodeUTF8Ex(
const char *arg,
Py_ssize_t arglen,
Expand Down
8 changes: 7 additions & 1 deletion Modules/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,13 @@ pymain_init_cmdline_argv(_PyMain *pymain, _PyCoreConfig *config,

for (int i = 0; i < pymain->argc; i++) {
size_t len;
wchar_t *arg = Py_DecodeLocale(pymain->bytes_argv[i], &len);
wchar_t *arg;
if (config->utf8_mode > 0) {
arg = _Py_DecodeUTF8(pymain->bytes_argv[i], &len);
}
else {
arg = Py_DecodeLocale(pymain->bytes_argv[i], &len);
}
if (arg == NULL) {
_Py_wstrlist_clear(i, argv);
pymain->err = DECODE_LOCALE_ERR("command line arguments",
Expand Down
15 changes: 15 additions & 0 deletions Python/fileutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,21 @@ Py_DecodeLocale(const char* arg, size_t *wlen)
}


wchar_t*
_Py_DecodeUTF8(const char* arg, size_t *wlen)
{
wchar_t *wstr;
int res = _Py_DecodeUTF8Ex(arg, strlen(arg), &wstr, wlen, NULL, 1);
if (res != 0) {
if (wlen != NULL) {
*wlen = (size_t)res;
}
return NULL;
}
return wstr;
}


static int
encode_current_locale(const wchar_t *text, char **str,
size_t *error_pos, const char **reason,
Expand Down