summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2016-09-23 20:24:39 +0200
committerChristian Heimes <christian@python.org>2016-09-23 20:24:39 +0200
commit6f3f3e5ca47ad00d1c5aaa97dc1a790b94dde3e3 (patch)
tree5702ad3aa4b52e272bb184d78d072a07f1d204c1
parent0202c347bc54c8a9a54e990c8f1fd4ce380b85e7 (diff)
parent3cb091e576cf3c8a71b8cff6951cfadfd8f5cd7a (diff)
downloadcpython-git-6f3f3e5ca47ad00d1c5aaa97dc1a790b94dde3e3.tar.gz
Increase buffer for readlink() in case OS will support longer names one day.
-rw-r--r--Modules/posixmodule.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 28d30b0f9a..01194aa850 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -6944,7 +6944,7 @@ posix_readlink(PyObject *self, PyObject *args, PyObject *kwargs)
{
path_t path;
int dir_fd = DEFAULT_DIR_FD;
- char buffer[MAXPATHLEN];
+ char buffer[MAXPATHLEN+1];
ssize_t length;
PyObject *return_value = NULL;
static char *keywords[] = {"path", "dir_fd", NULL};
@@ -6959,16 +6959,17 @@ posix_readlink(PyObject *self, PyObject *args, PyObject *kwargs)
Py_BEGIN_ALLOW_THREADS
#ifdef HAVE_READLINKAT
if (dir_fd != DEFAULT_DIR_FD)
- length = readlinkat(dir_fd, path.narrow, buffer, sizeof(buffer));
+ length = readlinkat(dir_fd, path.narrow, buffer, MAXPATHLEN);
else
#endif
- length = readlink(path.narrow, buffer, sizeof(buffer));
+ length = readlink(path.narrow, buffer, MAXPATHLEN);
Py_END_ALLOW_THREADS
if (length < 0) {
return_value = path_error(&path);
goto exit;
}
+ buffer[length] = '\0';
if (PyUnicode_Check(path.object))
return_value = PyUnicode_DecodeFSDefaultAndSize(buffer, length);