libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #370 from grissiom/romfs-next 

romfs: fix a use-before-set bug on checking the dirent
This commit is contained in:
Bernard Xiong 2014-11-03 23:13:34 +08:00
parent 00197fde12 28ff3ed186
commit 566cff0ff5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/dfs/filesystems/romfs/dfs_romfs.c
View File

@ -51,8 +51,8 @@ int dfs_romfs_ioctl(struct dfs_fd *file, int cmd, void *args)
rt_inline int check_dirent(struct romfs_dirent *dirent) rt_inline int check_dirent(struct romfs_dirent *dirent)
{ {
if (!(dirent->type == ROMFS_DIRENT_FILE || dirent->type == ROMFS_DIRENT_DIR) || if ((dirent->type != ROMFS_DIRENT_FILE && dirent->type != ROMFS_DIRENT_DIR)
(dirent->size == 0 || dirent->size == ~0)) || dirent->size == ~0)
return -1; return -1;
return 0; return 0;
} }
@ -191,7 +191,7 @@ int dfs_romfs_open(struct dfs_fd *file)
root_dirent = (struct romfs_dirent *)file->fs->data; root_dirent = (struct romfs_dirent *)file->fs->data;
if (check_dirent(dirent) != 0) if (check_dirent(root_dirent) != 0)
return -DFS_STATUS_EIO; return -DFS_STATUS_EIO;
if (file->flags & (DFS_O_CREAT | DFS_O_WRONLY | DFS_O_APPEND | DFS_O_TRUNC | DFS_O_RDWR)) if (file->flags & (DFS_O_CREAT | DFS_O_WRONLY | DFS_O_APPEND | DFS_O_TRUNC | DFS_O_RDWR))