Changeset 52acfab in mainline for uspace/lib/c/generic/dirent.c

Timestamp:

2019-05-28T19:24:14Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

77de449e

Parents:

af5037d (diff), bebd154 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-28 19:24:14)

git-committer:

GitHub <noreply@…> (2019-05-28 19:24:14)

Message:

Merge pull request #161 from le-jzr/cxxcompat2

C++ compatibility improvements

File:

• uspace/lib/c/generic/dirent.c (modified) (2 diffs)

uspace/lib/c/generic/dirent.c

@@ -39 +39 @@
 #include <errno.h>
 #include <assert.h>
+#include <string.h>
 
 struct __dirstream {
@@ -92 +93 @@
         ssize_t len = 0;
 
-        rc = vfs_read_short(dirp->fd, dirp->pos, &dirp->res.d_name[0],
-            NAME_MAX + 1, &len);
+        rc = vfs_read_short(dirp->fd, dirp->pos, dirp->res.d_name,
+            sizeof(dirp->res.d_name), &len);
         if (rc != EOK) {
                 errno = rc;
                 return NULL;
         }
+
+        assert(strnlen(dirp->res.d_name, sizeof(dirp->res.d_name)) < sizeof(dirp->res.d_name));
 
         dirp->pos += len;