diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-21 17:33:14 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-21 17:33:14 (GMT) |
| commit | 71d305c83d324ec46717924d119e27c03156b8fa (patch) | |
| tree | e24b4d62d68a35c2bbc2a75b44a166a5dc2256ef /Python/sysmodule.c | |
| parent | 06f018d54d939625c9d47525c8dc42755df11ce5 (diff) | |
| download | cpython-71d305c83d324ec46717924d119e27c03156b8fa.zip cpython-71d305c83d324ec46717924d119e27c03156b8fa.tar.gz cpython-71d305c83d324ec46717924d119e27c03156b8fa.tar.bz2 | |
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>`_.
........
................
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 33dfbb3..ea67710 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1555,7 +1555,7 @@ _wrealpath(const wchar_t *path, wchar_t *resolved_path) #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 @@ PySys_SetArgv(int argc, wchar_t **argv) 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 @@ PySys_SetArgv(int argc, wchar_t **argv) 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(). */ |