diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-05-24 00:34:50 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-05-24 00:34:50 (GMT) |
| commit | f64b9d5c710ea6614e8dc3ee86cc481d20e5beba (patch) | |
| tree | ced9c6bf0fc5c8fb9b00a641b9c83235b44c2ecc | |
| parent | 7ca13532f322e28102a56c9ba8eb8bc342f63883 (diff) | |
| download | cpython-f64b9d5c710ea6614e8dc3ee86cc481d20e5beba.zip cpython-f64b9d5c710ea6614e8dc3ee86cc481d20e5beba.tar.gz cpython-f64b9d5c710ea6614e8dc3ee86cc481d20e5beba.tar.bz2 | |
Fixes handling of long values of PYTHONPATH on Windows.
| -rw-r--r-- | PC/getpathp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/PC/getpathp.c b/PC/getpathp.c index 08b65c5..25b328b 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c @@ -620,21 +620,21 @@ calculate_path(void) if (*p == DELIM) bufsz++; /* number of DELIM plus one */ } - bufsz *= wcsnlen_s(pythonhome, MAXPATHLEN+1); + bufsz *= wcslen(pythonhome); } else bufsz = 0; - bufsz += wcsnlen_s(PYTHONPATH, MAXPATHLEN+1) + 1; - bufsz += wcsnlen_s(argv0_path, MAXPATHLEN+1) + 1; + bufsz += wcslen(PYTHONPATH) + 1; + bufsz += wcslen(argv0_path) + 1; #ifdef MS_WINDOWS if (!applocal && userpath) - bufsz += wcsnlen_s(userpath, MAXPATHLEN+1) + 1; + bufsz += wcslen(userpath) + 1; if (!applocal && machinepath) - bufsz += wcsnlen_s(machinepath, MAXPATHLEN+1) + 1; - bufsz += wcsnlen_s(zip_path, MAXPATHLEN+1) + 1; + bufsz += wcslen(machinepath) + 1; + bufsz += wcslen(zip_path) + 1; #endif if (envpath != NULL) - bufsz += wcsnlen_s(envpath, MAXPATHLEN+1) + 1; + bufsz += wcslen(envpath) + 1; module_search_path = buf = PyMem_RawMalloc(bufsz*sizeof(wchar_t)); if (buf == NULL) { |