mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-15 00:00:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Michael Hudson:

Browse source 
This patch changes posixmodule.c:execv to

a) check for zero length args (does this to execve, too), raising
   ValueError.

b) raises more rational exceptions for various flavours of duff arguments.
   I *hate*
      TypeError: "illegal argument type for built-in operation"
   It has to be one of the most frustrating error messages ever.
This commit is contained in:
Guido van Rossum 2000-04-26 20:34:28 +00:00
parent 868b50af17
commit 50422b403c
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Modules/posixmodule.c
View file

@ -1343,8 +1343,12 @@ posix_execv(self, args)
getitem = PyTuple_GetItem; getitem = PyTuple_GetItem;
} }
else { else {
badarg: PyErr_SetString(PyExc_TypeError, "argv must be tuple or list");
PyErr_BadArgument(); return NULL;
}
if (argc == 0) {
PyErr_SetString(PyExc_ValueError, "empty argument list");
return NULL; return NULL;
} }
@ -1354,7 +1358,10 @@ posix_execv(self, args)
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
if (!PyArg_Parse((*getitem)(argv, i), "s", &argvlist[i])) { if (!PyArg_Parse((*getitem)(argv, i), "s", &argvlist[i])) {
PyMem_DEL(argvlist); PyMem_DEL(argvlist);
goto badarg; PyErr_SetString(PyExc_TypeError,
"all arguments must be strings");
return NULL;
} }
} }
argvlist[argc] = NULL; argvlist[argc] = NULL;
@ -1416,6 +1423,12 @@ posix_execve(self, args)
return NULL; return NULL;
} }
if (argc == 0) {
PyErr_SetString(PyExc_ValueError,
"empty argument list");
return NULL;
}
argvlist = PyMem_NEW(char *, argc+1); argvlist = PyMem_NEW(char *, argc+1);
if (argvlist == NULL) { if (argvlist == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();