From 74bae256feaf297b80f0898c48ab762983b6c69a Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 31 Aug 2020 17:00:39 +0200 Subject: [PATCH] list-deltas: Don't break on non-subdir entries ostree_repo_list_static_delta_names() tried to validate that any second-level directory element was a directory, but there was a cut-and-paste issue, and it used `dent->d_type` instead of `sub_dent->d_type`. This fixes the code, but all old ostree versions will break if there are non-directories in a subdirectory of the deltas directory in the repo, so be wary. --- src/libostree/ostree-repo-static-delta-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c index ade4e9df..d12bf439 100644 --- a/src/libostree/ostree-repo-static-delta-core.c +++ b/src/libostree/ostree-repo-static-delta-core.c @@ -109,7 +109,7 @@ ostree_repo_list_static_delta_names (OstreeRepo *self, return FALSE; if (sub_dent == NULL) break; - if (dent->d_type != DT_DIR) + if (sub_dent->d_type != DT_DIR) continue; const char *name1 = dent->d_name;