diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-12-26 16:41:17 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-12-26 16:42:29 +0900 |
| commit | 5ffa6a0af4b45b0b7d97b854c3d03e5e82bfa6ee (patch) | |
| tree | 19b8220cef9ab5ce74821df90fe8795321d628c9 /src/dissect | |
| parent | 167f2c1a2bd3f2e1662a2f4a6aedaec92bc05df7 (diff) | |
| download | systemd-5ffa6a0af4b45b0b7d97b854c3d03e5e82bfa6ee.tar.gz | |
dissect: do not trigger assertion on error
recurse_dir() does not provide 'sx' on error.
Fixes #25862.
Diffstat (limited to 'src/dissect')
| -rw-r--r-- | src/dissect/dissect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index a9212f11fb..1d1b8ebc2d 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -901,11 +901,12 @@ static int mtree_print_item( int r; assert(path); - assert(sx); if (IN_SET(event, RECURSE_DIR_ENTER, RECURSE_DIR_ENTRY)) { _cleanup_free_ char *escaped = NULL; + assert(sx); + if (isempty(path)) path = "."; else { |