aboutsummaryrefslogtreecommitdiff
path: root/Python/pathconfig.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-05-16 16:39:26 +0200
committerGitHub <noreply@github.com>2019-05-16 16:39:26 +0200
commitdbacfc227381fbc7b3c886ea0bd7806ab3dc62c2 (patch)
tree7669139306b262719531d501001f417fb113f17b /Python/pathconfig.c
parent6e7890028213b30939327e7cf885bf097fc14472 (diff)
downloadcpython3-dbacfc227381fbc7b3c886ea0bd7806ab3dc62c2.tar.gz
bpo-36763: _PyInitError always use int for exitcode (GH-13360)
We cannot use "unsigned int" for exitcode on Windows, since Py_Main() and _Py_RunMain() always return an "int". Changes: * _PyPathConfig_ComputeSysPath0() now returns -1 if an exception is raised. * pymain_run_python() no longer uses _PyInitError but display the exception and set exitcode to 1 in case of error. * Fix _Py_RunMain(): return an exitcode rather than calling exit() on pymain_run_python() failure. * _Py_ExitInitError() no longer uses ExitProcess() on Windows, use exit() on all platforms. * _Py_ExitInitError() now fails with a fatal error if 'err' is not an error not an exit.
Diffstat (limited to 'Python/pathconfig.c')
-rw-r--r--Python/pathconfig.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index 7fea7c3667..2fcb816058 100644
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -570,18 +570,17 @@ Py_GetProgramName(void)
directory ("-m module" case) which will be prepended to sys.argv:
sys.path[0].
- Return 1 if the path is correctly resolved, but *path0_p can be NULL
- if the Unicode object fail to be created.
+ Return 1 if the path is correctly resolved and written into *path0_p.
- Return 0 if it fails to resolve the full path (and *path0_p will be NULL).
- For example, return 0 if the current working directory has been removed
- (bpo-36236) or if argv is empty.
+ Return 0 if it fails to resolve the full path. For example, return 0 if the
+ current working directory has been removed (bpo-36236) or if argv is empty.
+
+ Raise an exception and return -1 on error.
*/
int
_PyPathConfig_ComputeSysPath0(const _PyWstrList *argv, PyObject **path0_p)
{
assert(_PyWstrList_CheckConsistency(argv));
- assert(*path0_p == NULL);
if (argv->length == 0) {
/* Leave sys.path unchanged if sys.argv is empty */
@@ -697,7 +696,12 @@ _PyPathConfig_ComputeSysPath0(const _PyWstrList *argv, PyObject **path0_p)
}
#endif /* All others */
- *path0_p = PyUnicode_FromWideChar(path0, n);
+ PyObject *path0_obj = PyUnicode_FromWideChar(path0, n);
+ if (path0_obj == NULL) {
+ return -1;
+ }
+
+ *path0_p = path0_obj;
return 1;
}