From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Tue, 9 Sep 2008 13:56:11 +0000 (+0000)
Subject: Issue #3813: cannot lanch python.exe via symbolic link on cygwin.
X-Git-Tag: v3.0rc1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8247796b12ba699da67601f7ff5f043b2d7998e;p=python

Issue #3813: cannot lanch python.exe via symbolic link on cygwin.
readlink(2) can return non-null-terminated string.
Reviewed by Amaury Forgeot d'Arc.
---

diff --git a/Modules/getpath.c b/Modules/getpath.c
index f752a7ff97..064877c0fc 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -183,6 +183,7 @@ _Py_wreadlink(const wchar_t *path, wchar_t *buf, size_t bufsiz)
 	errno = EINVAL;
 	return -1;
     }
+    cbuf[res] = '\0'; /* buf will be null terminated */
     r1 = mbstowcs(buf, cbuf, bufsiz);
     if (r1 == -1) {
 	errno = EINVAL;
@@ -559,8 +560,6 @@ calculate_path(void)
         wchar_t tmpbuffer[MAXPATHLEN+1];
         int linklen = _Py_wreadlink(progpath, tmpbuffer, MAXPATHLEN);
         while (linklen != -1) {
-            /* It's not null terminated! */
-            tmpbuffer[linklen] = '\0';
             if (tmpbuffer[0] == SEP)
                 /* tmpbuffer should never be longer than MAXPATHLEN,
                    but extra check does not hurt */