48b8fce Fix memory leak of oi.arch and oi.name — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix memory leak of oi.arch and oi.name

Alex Richardson committed 5 years ago

commit 48b8fceede2d5f0ca767ff673ac09a28ee0e3698
parent 8ad9977

2 files changed +29 -10

modified libpkg/pkg_config.c

@@ -982,11 +982,13 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 	char *tmp = NULL;
 	struct os_info oi;
 	size_t ukeylen;
 	int err = EPKG_OK;
 	k = NULL;
 	o = NULL;
 	if (ctx.rootfd == -1 && (ctx.rootfd = open("/", O_DIRECTORY|O_RDONLY|O_CLOEXEC)) < 0) {
 		pkg_emit_error("Impossible to open /");
 		/* Note: Not goto out since oi.arch hasn't been initialized yet. */
 		return (EPKG_FATAL);
 	}

@@ -999,13 +1001,15 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 #endif
 	if (parsed != false) {
 		pkg_emit_error("pkg_init() must only be called once");
 		return (EPKG_FATAL);
 		err = EPKG_FATAL;
 		goto out;
 	}
 	if (((flags & PKG_INIT_FLAG_USE_IPV4) == PKG_INIT_FLAG_USE_IPV4) &&
 	    ((flags & PKG_INIT_FLAG_USE_IPV6) == PKG_INIT_FLAG_USE_IPV6)) {
 		pkg_emit_error("Invalid flags for pkg_init()");
 		return (EPKG_FATAL);
 		err = EPKG_FATAL;
 		goto out;
 	}
 	config = ucl_object_typed_new(UCL_OBJECT);

@@ -1172,7 +1176,8 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 	if (fatal_errors) {
 		ucl_object_unref(ncfg);
 		ucl_parser_free(p);
 		return (EPKG_FATAL);
 		err = EPKG_FATAL;
 		goto out;
 	}
 	if (ncfg != NULL) {

@@ -1284,7 +1289,8 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 	if (pkg_object_string(pkg_config_get("ABI")) == NULL ||
 	    strcmp(pkg_object_string(pkg_config_get("ABI")), "unknown") == 0) {
 		pkg_emit_error("Unable to determine ABI");
 		return (EPKG_FATAL);
 		err = EPKG_FATAL;
 		goto out;
 	}
 	pkg_debug(1, "%s", "pkg initialized");

@@ -1339,7 +1345,8 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 		buf = strstr(url, ":/");
 		if (buf == NULL) {
 			pkg_emit_error("invalid url: %s", url);
 			return (EPKG_FATAL);
 			err = EPKG_FATAL;
 			goto out;
 		}
 		fatal_errors = true;
 		it = NULL;

@@ -1353,7 +1360,8 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 		if (fatal_errors) {
 			pkg_emit_error("invalid scheme %.*s", (int)(buf - url), url);
 			return (EPKG_FATAL);
 			err = EPKG_FATAL;
 			goto out;
 		}
 	}

@@ -1366,11 +1374,16 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)

 	metalog = pkg_object_string(pkg_config_get("METALOG"));
 	if (metalog != NULL) {
 		if(metalog_open(metalog) != EPKG_OK) {
 			return (EPKG_FATAL);
 			err = EPKG_FATAL;
 			goto out;
 		}
 	}
 	return (EPKG_OK);
 out:
 	free(oi.arch);
 	free(oi.name);
 	return err;
 }
 static struct pkg_repo_ops*

modified libpkg/pkg_elf.c

@@ -1066,7 +1066,9 @@ pkg_get_myarch_elfparse(char *dest, size_t sz, struct os_info *oi)

 cleanup:
 	if (elf != NULL)
 		elf_end(elf);
 	if (oi == &loi) {
 		free(oi->name);
 	}
 	close(fd);
 	return (ret);
 }

@@ -1133,8 +1135,12 @@ pkg_get_myarch(char *dest, size_t sz, struct os_info *oi)

 	char *arch_tweak;
 	int err;
 	err = pkg_get_myarch_elfparse(dest, sz, oi);
 	if (err)
 	if (err) {
 		if (oi) {
 			free(oi->name);
 		}
 		return (err);
 	}
 #ifdef __DragonFly__
 	if (strncasecmp(dest, "DragonFly", 9) == 0) {