Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 2d4a921
Revert "fetch: Fix pkg_fetch_file_to_fd cleanup"
Baptiste Daroussin committed 4 months ago
commit 2d4a9215af292b8e4dc24e85f2c2bfb9c0ae6b27
parent 2d18505
2 files changed +2 -15
modified libpkg/fetch.c
@@ -301,20 +301,8 @@ cleanup:
		unsetenv(vec_pop(&envtounset));

	vec_free(&envtounset);
- 
	if (repo->fetcher != NULL) {
- 
		if (repo->fetcher->close != NULL) {
- 
			repo->fetcher->close(repo);
- 
		}
-
- 
		if (repo->fetcher->cleanup != NULL) {
- 
			repo->fetcher->cleanup(repo);
- 
		}
- 
	}
-
- 
	if (fakerepo)
- 
	{
- 
		free(fakerepo->url);
- 
	}
+ 
	if (repo->fetcher != NULL && repo->fetcher->close != NULL)
+ 
		repo->fetcher->close(repo);

	free(fakerepo);



	if (retcode == EPKG_OK) {
modified libpkg/fetch_libcurl.c
@@ -578,6 +578,5 @@ curl_cleanup(struct pkg_repo *repo)
	curl_multi_cleanup(cr->cm);

	if (cr->url != NULL)

		curl_url_cleanup(cr->url);
- 
	free(repo->fetch_priv);

	repo->fetch_priv = NULL;

}