From 7a0899d2f38de08dcde7980bb30ee321e625931e Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 2 Dec 2017 20:03:28 +0200 Subject: [PATCH] bpo-32197: Try to fix a compiler error introduced in bpo-32030. --- Modules/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Modules/main.c b/Modules/main.c index 84706e1e29063a4..5c4e52cd9f1e2b3 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -901,8 +901,8 @@ config_get_program_name(_PyMainInterpreterConfig *config) size_t len; wchar_t* program_name = Py_DecodeLocale(p, &len); if (program_name == NULL) { - return SET_DECODE_ERROR("PYTHONEXECUTABLE environment " - "variable", len); + SET_DECODE_ERROR("PYTHONEXECUTABLE environment variable", len); + return -1; } config->program_name = program_name; } @@ -916,8 +916,9 @@ config_get_program_name(_PyMainInterpreterConfig *config) size_t len; wchar_t* program_name = Py_DecodeLocale(pyvenv_launcher, &len); if (program_name == NULL) { - return SET_DECODE_ERROR("__PYVENV_LAUNCHER__ environment " - "variable", len); + SET_DECODE_ERROR("__PYVENV_LAUNCHER__ environment variable", + len); + return -1; } config->program_name = program_name; }