Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › fa222f6
Fix a memleak introduced in aca7c85ca.
jlaffaye committed 15 years ago
commit fa222f61dc9896500f50fcde30b7d55bcb279409
parent 294ffce
2 files changed +20 -10
modified libpkg/pkg.c
@@ -216,13 +216,13 @@ pkg_conflicts(struct pkg *pkg)
int

pkg_open(struct pkg **pkg_p, const char *path)

{
- 
	struct archive *a = NULL;
- 
	struct archive_entry *ae = NULL;
+ 
	struct archive *a;
+ 
	struct archive_entry *ae;

	int retcode;



	retcode = pkg_open2(pkg_p, &a, &ae, path);
- 
	if (a != NULL)
+ 
	if (retcode == EPKG_OK)

		archive_read_finish(a);



	return (retcode);
@@ -247,6 +247,11 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae, con
	archive_read_support_compression_all(*a);

	archive_read_support_format_tar(*a);
+ 
	if (archive_read_open_filename(*a, path, 4096) != ARCHIVE_OK) {
+ 
		retcode = pkg_error_set(EPKG_FATAL, "%s", archive_error_string(*a));
+ 
		goto cleanup;
+ 
	}
+ 


	if (*pkg_p == NULL)

		pkg_new(pkg_p);

	else
@@ -255,9 +260,6 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae, con
	pkg = *pkg_p;

	pkg->type = PKG_FILE;
- 
	if (archive_read_open_filename(*a, path, 4096) != ARCHIVE_OK)
- 
		return (pkg_error_set(EPKG_FATAL, "%s", archive_error_string(*a)));
- 


	array_init(&pkg->scripts, 10);

	array_init(&pkg->files, 10);
@@ -275,7 +277,7 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae, con
			free(manifest);

			if (ret != EPKG_OK) {

				retcode = EPKG_FATAL;
- 
				break;
+ 
				goto cleanup;

			}

		}
@@ -315,8 +317,16 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae, con
		COPY_SCRIPT("+UPGRADE", PKG_SCRIPT_UPGRADE)

	}
- 
	if (ret != ARCHIVE_OK && ret != ARCHIVE_EOF) {
+ 
	if (ret != ARCHIVE_OK && ret != ARCHIVE_EOF)

		retcode = pkg_error_set(EPKG_FATAL, "%s", archive_error_string(*a));
+
+
+ 
	cleanup:
+ 
	if (retcode != EPKG_OK) {
+ 
		if (*a != NULL)
+ 
			archive_read_finish(*a);
+ 
		*a = NULL;
+ 
		*ae = NULL;

	}



	return (retcode);
modified libpkg/pkg_add.c
@@ -36,8 +36,8 @@ extract(struct archive *a, struct archive_entry *ae)
int

pkg_add(struct pkgdb *db, const char *path)

{
- 
	struct archive *a = NULL;
- 
	struct archive_entry *ae = NULL;
+ 
	struct archive *a;
+ 
	struct archive_entry *ae;

	struct pkgdb_it *it;

	struct pkg *pkg = NULL;

	struct pkg *p = NULL;