5a91078 Fix mess up in the fd during meta.conf fetching — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix mess up in the fd during meta.conf fetching

Baptiste Daroussin committed 6 years ago

commit 5a910786bffaec970642bb78d0817cbca84ecf2f
parent caf7e16

1 file changed +4 -3

modified libpkg/pkg_repo.c

@@ -787,9 +787,10 @@ pkg_repo_fetch_meta(struct pkg_repo *repo, time_t *t)

 	fd = pkg_repo_fetch_remote_tmp(repo, "meta", "conf", t, &rc, true);
 	if (fd != -1) {
 		newscheme = true;
 		metafd = openat(dbdirfd, filepath, O_RDWR|O_CREAT|O_TRUNC, 0644);
 		if (metafd == -1) {
 			close(fd);
 		metafd = fd;
 		fd = openat(dbdirfd, filepath, O_RDWR|O_CREAT|O_TRUNC, 0644);
 		if (fd == -1) {
 			close(metafd);
 			return (EPKG_FATAL);
 		}
 		goto load_meta;