Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5618311
libpkg: fix shlib_valid_abi()
Isaac Freund committed 1 year ago
commit 56183112fe3bc3c6780515200db4d9d754b737f3
parent 07ca3e8
1 file changed +4 -7
modified libpkg/pkg_elf.c
@@ -151,7 +151,7 @@ add_shlibs_to_pkg(struct pkg *pkg, const char *fpath, const char *name,
}



static bool
- 
shlib_valid_abi(const char *fpath, GElf_Ehdr *hdr, const char *abi)
+ 
shlib_valid_abi(const char *fpath, GElf_Ehdr *hdr)

{

	int semicolon;

	const char *p, *t;
@@ -160,13 +160,13 @@ shlib_valid_abi(const char *fpath, GElf_Ehdr *hdr, const char *abi)
	const char *shlib_arch;



	/*
- 
	 * ABI string is in format:
+ 
	 * ALTABI string is in format:

	 * <osname>:<osversion>:<arch>:<wordsize>[.other]

	 * We need here arch and wordsize only

	 */

	arch[0] = '\0';

	wordsize[0] = '\0';
- 
	p = abi;
+ 
	p = pkg_object_string(pkg_config_get("ALTABI"));

	for(semicolon = 0; semicolon < 3 && p != NULL; semicolon ++, p ++) {

		p = strchr(p, ':');

		if (p != NULL) {
@@ -265,14 +265,11 @@ analyse_elf(struct pkg *pkg, const char *fpath)
	size_t numdyn = 0;

	size_t sh_link = 0;

	size_t dynidx;
- 
	const char *myarch;

	const char *shlib;

	char *rpath = NULL;



	bool is_shlib = false;
- 
	myarch = pkg_object_string(pkg_config_get("ABI"));
- 


	int fd;



	pkg_debug(1, "analysing elf %s", fpath);
@@ -360,7 +357,7 @@ analyse_elf(struct pkg *pkg, const char *fpath)
		goto cleanup; /* not a dynamically linked elf: no results */

	}
- 
	if (!shlib_valid_abi(fpath, &elfhdr, myarch)) {
+ 
	if (!shlib_valid_abi(fpath, &elfhdr)) {

		ret = EPKG_END;

		goto cleanup; /* Invalid ABI */

	}