Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 59d443a
fetch: Fix pkg_fetch_file_to_fd cleanup
Tuukka Pasanen committed 4 months ago
commit 59d443a446e08b5e3ec1e778f1c04ff3435518de
parent daa6b44
2 files changed +15 -2
modified libpkg/fetch.c
@@ -301,8 +301,20 @@ cleanup:
		unsetenv(vec_pop(&envtounset));

	vec_free(&envtounset);
- 
	if (repo->fetcher != NULL && repo->fetcher->close != NULL)
- 
		repo->fetcher->close(repo);
+ 
	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);
+ 
	}

	free(fakerepo);



	if (retcode == EPKG_OK) {
modified libpkg/fetch_libcurl.c
@@ -578,5 +578,6 @@ 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;

}