(Merge 3.3) sysmodule.c: fix sys_update_path(), use Py_ARRAY_LENGTH() to get

vstinner · vstinner · commit 50e015701381 · 2013-11-15T17:35:31.000+01:00
the size of the fullpath buffer, not PATH_MAX. fullpath is declared using
MAXPATHLEN or MAX_PATH depending on the OS, and PATH_MAX is not declared on
IRIX.
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -1959,7 +1959,7 @@ sys_update_path(int argc, wchar_t **argv)
 #else /* All other filename syntaxes */
     if (_HAVE_SCRIPT_ARGUMENT(argc, argv)) {
 #if defined(HAVE_REALPATH)
-        if (_Py_wrealpath(argv0, fullpath, PATH_MAX)) {
+        if (_Py_wrealpath(argv0, fullpath, Py_ARRAY_LENGTH(fullpath))) {
             argv0 = fullpath;
         }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1959,7 +1959,7 @@ sys_update_path(int argc, wchar_t **argv)`
`1959`	`1959`	`#else /* All other filename syntaxes */`
`1960`	`1960`	`if (_HAVE_SCRIPT_ARGUMENT(argc, argv)) {`
`1961`	`1961`	`#if defined(HAVE_REALPATH)`
`1962`		`- if (_Py_wrealpath(argv0, fullpath, PATH_MAX)) {`
	`1962`	`+ if (_Py_wrealpath(argv0, fullpath, Py_ARRAY_LENGTH(fullpath))) {`
`1963`	`1963`	`argv0 = fullpath;`
`1964`	`1964`	`}`
`1965`	`1965`	`#endif`