diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-10 14:40:05 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-10 14:44:24 +0100 |
| commit | aa2c234ecb512bc4fc52fa1601377c31dfb58552 (patch) | |
| tree | ee6fae146bfde2b45161b0de81c62127c73461ba | |
| parent | 46c16855b1bed2704549d834acd2e9812ff3bf1e (diff) | |
mkfs.ubifs: abort add_directory if readdir fails
The existing code sets 'err' to -1 and breaks the readdir loop, but
the error state is never read. This patch modifies the readdir loop
to actualy jump to the error handling branch if readdir fails.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c index 5748aaa..72ae1b4 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -2043,8 +2043,7 @@ static int add_directory(const char *dir_name, ino_t dir_inum, struct stat *st, if (errno == 0) break; sys_err_msg("error reading directory '%s'", dir_name); - err = -1; - break; + goto out_free; } if (strcmp(".", entry->d_name) == 0) |