Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f8eb929
prevent undefined behaviour (detected by UBSAN)
Baptiste Daroussin committed 1 year ago
commit f8eb92999ee8e0509ceef357329c32517dca6436
parent c01f2b7
1 file changed +16 -8
modified libpkg/pkg.c
@@ -1714,14 +1714,22 @@ pkg_lists_sort(struct pkg *p)
		return;

	p->list_sorted = true;
- 
	qsort(p->categories.d, p->categories.len, sizeof(char *), char_cmp);
- 
	qsort(p->licenses.d, p->licenses.len, sizeof(char *), char_cmp);
- 
	qsort(p->users.d, p->users.len, sizeof(char *), char_cmp);
- 
	qsort(p->groups.d, p->groups.len, sizeof(char *), char_cmp);
- 
	qsort(p->shlibs_required.d, p->shlibs_required.len, sizeof(char *), char_cmp);
- 
	qsort(p->shlibs_provided.d, p->shlibs_provided.len, sizeof(char *), char_cmp);
- 
	qsort(p->provides.d, p->provides.len, sizeof(p->provides.d[0]), char_cmp);
- 
	qsort(p->requires.d, p->requires.len, sizeof(p->requires.d[0]), char_cmp);
+ 
	if (p->categories.d)
+ 
		qsort(p->categories.d, p->categories.len, sizeof(char *), char_cmp);
+ 
	if (p->licenses.d)
+ 
		qsort(p->licenses.d, p->licenses.len, sizeof(char *), char_cmp);
+ 
	if (p->users.d)
+ 
		qsort(p->users.d, p->users.len, sizeof(char *), char_cmp);
+ 
	if (p->groups.d)
+ 
		qsort(p->groups.d, p->groups.len, sizeof(char *), char_cmp);
+ 
	if (p->shlibs_required.d)
+ 
		qsort(p->shlibs_required.d, p->shlibs_required.len, sizeof(char *), char_cmp);
+ 
	if (p->shlibs_provided.d)
+ 
		qsort(p->shlibs_provided.d, p->shlibs_provided.len, sizeof(char *), char_cmp);
+ 
	if (p->provides.d)
+ 
		qsort(p->provides.d, p->provides.len, sizeof(p->provides.d[0]), char_cmp);
+ 
	if (p->requires.d)
+ 
		qsort(p->requires.d, p->requires.len, sizeof(p->requires.d[0]), char_cmp);

	DL_SORT(p->depends, pkg_dep_cmp);

	DL_SORT(p->files, pkg_file_cmp);

	DL_SORT(p->dirs, pkg_dir_cmp);