Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Change sys_exit to use METH_VARARGS. 

sys.exit() now requires 0-1 arguments.  Previously 2+ arguments were allowed.
This commit is contained in:
Neal Norwitz 2002-03-27 13:03:09 +00:00
parent 496f9e41ef
commit 0c766a0bb6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -26,6 +26,9 @@ Core and builtins
- posix.killpg has been added where available. - posix.killpg has been added where available.
- sys.exit() inadvertantly allowed more than one argument.
An exception will now be raised if more than one argument is used.
Extension modules Extension modules
- A security hole ("double free") was found in zlib-1.1.3, a popular - A security hole ("double free") was found in zlib-1.1.3, a popular

7
Python/sysmodule.c
View File

@ -146,8 +146,11 @@ This should be called from inside an except clause only.";
static PyObject * static PyObject *
sys_exit(PyObject *self, PyObject *args) sys_exit(PyObject *self, PyObject *args)
{ {
PyObject *exit_code = 0;
if (!PyArg_ParseTuple(args, "|O:exit", &exit_code))
return NULL;
/* Raise SystemExit so callers may catch it or clean up. */ /* Raise SystemExit so callers may catch it or clean up. */
PyErr_SetObject(PyExc_SystemExit, args); PyErr_SetObject(PyExc_SystemExit, exit_code);
return NULL; return NULL;
} }
@ -528,7 +531,7 @@ static PyMethodDef sys_methods[] = {
{"displayhook", sys_displayhook, METH_O, displayhook_doc}, {"displayhook", sys_displayhook, METH_O, displayhook_doc},
{"exc_info", (PyCFunction)sys_exc_info, METH_NOARGS, exc_info_doc}, {"exc_info", (PyCFunction)sys_exc_info, METH_NOARGS, exc_info_doc},
{"excepthook", sys_excepthook, METH_VARARGS, excepthook_doc}, {"excepthook", sys_excepthook, METH_VARARGS, excepthook_doc},
{"exit", sys_exit, METH_OLDARGS, exit_doc}, {"exit", sys_exit, METH_VARARGS, exit_doc},
#ifdef Py_USING_UNICODE #ifdef Py_USING_UNICODE
{"getdefaultencoding", (PyCFunction)sys_getdefaultencoding, METH_NOARGS, {"getdefaultencoding", (PyCFunction)sys_getdefaultencoding, METH_NOARGS,
getdefaultencoding_doc}, getdefaultencoding_doc},