diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-07-05 12:16:36 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-07-08 19:17:35 +0200 |
| commit | 75063b2e14dacc13fcbeeba24e580198a7c1c638 (patch) | |
| tree | f58b8c85ed5472523a5596be3434f7488dbfe465 /bin/rdsquashfs/fill_files.c | |
| parent | 3946cf086183f8dd4d5d115f52ba1b87560b7ce4 (diff) | |
Make sqfs_tree_node_get_path more robust
Test against various invariants:
- Every non-root node must have a name
- The root node muts not have a name
- The name must not be ".." or "."
- The name must not contain '/'
- The loop that chases parent pointers must terminate, i.e. we must
never reach the starting state again (link loop).
Furthermore, make sure the sum of all path components plus separators
does not overflow.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/rdsquashfs/fill_files.c')
| -rw-r--r-- | bin/rdsquashfs/fill_files.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/rdsquashfs/fill_files.c b/bin/rdsquashfs/fill_files.c index 8459c1e..923bc12 100644 --- a/bin/rdsquashfs/fill_files.c +++ b/bin/rdsquashfs/fill_files.c @@ -67,6 +67,7 @@ static int add_file(const sqfs_tree_node_t *node) struct file_ent *new; size_t new_sz; char *path; + int ret; if (num_files == max_files) { new_sz = max_files ? max_files * 2 : 256; @@ -81,9 +82,9 @@ static int add_file(const sqfs_tree_node_t *node) max_files = new_sz; } - path = sqfs_tree_node_get_path(node); - if (path == NULL) { - perror("assembling file path"); + ret = sqfs_tree_node_get_path(node, &path); + if (ret != 0) { + sqfs_perror(NULL, "assembling file path", ret); return -1; } |