Mercurial > cpython-lru_cache-weakref
diff Python/sysmodule.c @ 61791:9db8c414921f 3.1
Merged revisions 81400 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r81400 | antoine.pitrou | 2010-05-21 19:25:34 +0200 (ven., 21 mai 2010) | 12 lines
Merged revisions 81398 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81398 | antoine.pitrou | 2010-05-21 19:12:38 +0200 (ven., 21 mai 2010) | 6 lines
Issue #5753: A new C API function, :cfunc:`PySys_SetArgvEx`, allows
embedders of the interpreter to set sys.argv without also modifying
sys.path. This helps fix `CVE-2008-5983
<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5983>`_.
........
................
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Fri, 21 May 2010 17:33:14 +0000 |
| parents | f197407bdba2 |
| children | 7ccc55811413 |
line wrap: on
line diff
--- a/Python/sysmodule.c Fri May 21 13:11:00 2010 +0000 +++ b/Python/sysmodule.c Fri May 21 17:33:14 2010 +0000 @@ -1555,7 +1555,7 @@ #endif void -PySys_SetArgv(int argc, wchar_t **argv) +PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath) { #if defined(HAVE_REALPATH) wchar_t fullpath[MAXPATHLEN]; @@ -1568,7 +1568,7 @@ Py_FatalError("no mem for sys.argv"); if (PySys_SetObject("argv", av) != 0) Py_FatalError("can't assign sys.argv"); - if (path != NULL) { + if (updatepath && path != NULL) { wchar_t *argv0 = argv[0]; wchar_t *p = NULL; Py_ssize_t n = 0; @@ -1655,6 +1655,12 @@ Py_DECREF(av); } +void +PySys_SetArgv(int argc, wchar_t **argv) +{ + PySys_SetArgvEx(argc, argv, 1); +} + /* Reimplementation of PyFile_WriteString() no calling indirectly PyErr_CheckSignals(): avoid the call to PyObject_Str(). */