Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › e5f4f3a
extract: accept /usr/local/lib/compat as symlinks
Baptiste Daroussin committed 1 year ago
commit e5f4f3a2adef0a5e84de85918b82693f888f36aa
parent 4383e4d
2 files changed +6 -3
modified libpkg/pkg_add.c
@@ -1446,8 +1446,11 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
	 * Extract the files on disk.

	 */

	if (extract) {
+ 
		char *compat;

		pkg_register_cleanup_callback(pkg_rollback_cb, pkg);
- 
		vec_push(context.symlinks_allowed, pkg->prefix);
+ 
		vec_push(context.symlinks_allowed, xstrdup(pkg->prefix));
+ 
		xasprintf(&compat, "%s/lib/compat", pkg->prefix);
+ 
		vec_push(context.symlinks_allowed, compat);

		retcode = do_extract(a, ae, nfiles, local, &tempdirs, &context);

		pkg_unregister_cleanup_callback(pkg_rollback_cb, pkg);

		if (retcode != EPKG_OK) {
@@ -1546,7 +1549,7 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,
	}



cleanup:
- 
	vec_free(context.symlinks_allowed);
+ 
	vec_free_and_free(context.symlinks_allowed, free);

	free(context.symlinks_allowed);



	if (openxact)
modified libpkg/private/add.h
@@ -10,7 +10,7 @@


struct pkg_add_context {

	int rootfd;
- 
	c_charv_t *symlinks_allowed;
+ 
	charv_t *symlinks_allowed;

	struct pkgdb *db;

	struct pkg *pkg;

};