vfs: fix readdir bug

2022-07-31 22:44:59 +08:00
parent 9f24c1fedd
commit 3c1eac5bb0
2 changed files with 2 additions and 2 deletions
--- a/components/fs/fatfs/wrapper/tos_fatfs_vfs.c
+++ b/components/fs/fatfs/wrapper/tos_fatfs_vfs.c
@@ -220,7 +220,7 @@ static int fatfs_readdir(vfs_dir_t *dir, vfs_dirent_t *dirent)

    dp = (DIR *)dir->private;
    res = tos_f_readdir(dp, &info);
-    if (res != FR_OK) {
+    if (res != FR_OK || info.fname[0] == 0) {
        return -1;
    }

--- a/components/fs/vfs/tos_vfs.c
+++ b/components/fs/vfs/tos_vfs.c
@@ -430,7 +430,7 @@ __API__ vfs_dirent_t *tos_vfs_readdir(VFS_DIR *dirp)
    vfs_dir_t *dir = K_NULL;
    vfs_inode_t *inode = K_NULL;

-    if (!dir) {
+    if (!dirp) {
        return K_NULL;
    }