packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/commit: Check that dirent is a directory before cleaning 

I've only noticed this by inspection. But I think it's possible for
`cleanup_txn_dir` to get called with the `staging-...-lock` file since
it matches the prefix.

Make the checking here stronger by verifying that it's a directory. If
it's not a directory (lockfile), then follow the default pruning expiry
logic so that we still cleanup stray lockfiles eventually.
This commit is contained in:
Jonathan Lebon 2020-04-17 14:29:13 -04:00
parent df065ad766
commit 8ece36c28a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-repo-commit.c
View File

@ -2011,7 +2011,7 @@ cleanup_tmpdir (OstreeRepo *self,
continue; continue;
/* Handle transaction tmpdirs */ /* Handle transaction tmpdirs */
if (_ostree_repo_has_staging_prefix (dent->d_name)) if (_ostree_repo_has_staging_prefix (dent->d_name) && S_ISDIR (stbuf.st_mode))
{ {
if (!cleanup_txn_dir (self, dfd_iter.fd, dent->d_name, cancellable, error)) if (!cleanup_txn_dir (self, dfd_iter.fd, dent->d_name, cancellable, error))
return FALSE; return FALSE;