mkfs.jffs2: fix segfault when parsing dev table

Make sure that the first item is parsed correctly. One issue otherwise is
a null pointer dereference when the first item is not found.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
index b9dd96b27f2e3c4bf749ce9647e16f3b6bd28b1e..da07b69e4e87d87f6d19c65d0fb24862fabf963b 100644 (file)
--- a/jffsX-utils/mkfs.jffs2.c
+++ b/jffsX-utils/mkfs.jffs2.c
@@ -428,7 +428,7 @@ static int interpret_table_entry(struct filesystem_entry *root, char *line)
 
        if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu %lu",
                                SCANF_STRING(name), &type, &mode, &uid, &gid, &major, &minor,
-                               &start, &increment, &count) < 0)
+                               &start, &increment, &count) < 2)
        {
                return 1;
        }