traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-30602: Fix lastarg in os.spawnve() (#2287) 

Fix a regression introduced by myself in the commit
526b22657c.
This commit is contained in:
Victor Stinner 2017-06-23 15:04:46 +02:00 committed by GitHub
parent 87c6555073
commit c8d6ab2e25
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/posixmodule.c
View File

@ -5223,7 +5223,7 @@ os_spawnve_impl(PyObject *module, int mode, path_t *path, PyObject *argv,
Py_ssize_t argc, i, envc; Py_ssize_t argc, i, envc;
intptr_t spawnval; intptr_t spawnval;
PyObject *(*getitem)(PyObject *, Py_ssize_t); PyObject *(*getitem)(PyObject *, Py_ssize_t);
Py_ssize_t lastarg = -1; Py_ssize_t lastarg = 0;
/* spawnve has four arguments: (mode, path, argv, env), where /* spawnve has four arguments: (mode, path, argv, env), where
argv is a list or tuple of strings and env is a dictionary argv is a list or tuple of strings and env is a dictionary
@ -5266,7 +5266,7 @@ os_spawnve_impl(PyObject *module, int mode, path_t *path, PyObject *argv,
goto fail_1; goto fail_1;
} }
if (i == 0 && !argvlist[0][0]) { if (i == 0 && !argvlist[0][0]) {
lastarg = i; lastarg = i + 1;
PyErr_SetString( PyErr_SetString(
PyExc_ValueError, PyExc_ValueError,
"spawnv() arg 2 first element cannot be empty"); "spawnv() arg 2 first element cannot be empty");
@ -5302,7 +5302,7 @@ os_spawnve_impl(PyObject *module, int mode, path_t *path, PyObject *argv,
PyMem_DEL(envlist[envc]); PyMem_DEL(envlist[envc]);
PyMem_DEL(envlist); PyMem_DEL(envlist);
fail_1: fail_1:
free_string_array(argvlist, lastarg + 1); free_string_array(argvlist, lastarg);
fail_0: fail_0:
return res; return res;
} }