bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libalpm: check calloc in alpm_list_cmp_unsorted

Browse source
This commit is contained in:
morganamilo 2024-02-15 03:40:40 +00:00 • committed by Allan McRae
parent 7a43c6fee0
commit abc6dd7411
3 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/libalpm/alpm_list.c
View file

@ -535,6 +535,9 @@ int SYMEXPORT alpm_list_cmp_unsorted(const alpm_list_t *left,
}
matched = calloc(alpm_list_count(right), sizeof(int));
if(matched == NULL) {
return -1;
}
for(l = left; l; l = l->next) {
int found = 0;

2
lib/libalpm/alpm_list.h
View file

@ -339,7 +339,7 @@ char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle);
* @param right the second list
* @param fn the comparison function
*
* @return 1 if the lists are equal, 0 otherwise.
* @return 1 if the lists are equal, 0 if not equal, -1 on error.
*/
int alpm_list_cmp_unsorted(const alpm_list_t *left,
const alpm_list_t *right, alpm_list_fn_cmp fn);

30
lib/libalpm/sync.c
View file

@ -1079,13 +1079,16 @@ static int dep_not_equal(const alpm_depend_t *left, const alpm_depend_t *right)
static int check_pkg_field_matches_db(alpm_handle_t *handle, const char *field,
alpm_list_t *left, alpm_list_t *right, alpm_list_fn_cmp cmp)
{
if(!alpm_list_cmp_unsorted(left, right, cmp)) {
switch(alpm_list_cmp_unsorted(left, right, cmp)) {
case 0:
_alpm_log(handle, ALPM_LOG_DEBUG,
"internal package %s mismatch\n", field);
return 1;
}
case 1:
return 0;
default:
RET_ERR(handle, ALPM_ERR_MEMORY, -1);
}
}
static int check_pkg_matches_db(alpm_pkg_t *spkg, alpm_pkg_t *pkgfile)
@ -1093,6 +1096,15 @@ static int check_pkg_matches_db(alpm_pkg_t *spkg, alpm_pkg_t *pkgfile)
alpm_handle_t *handle = spkg->handle;
int error = 0;
#define CHECK_FIELD(STR, FIELD, CMP) do { \
int ok = check_pkg_field_matches_db(handle, STR, spkg->FIELD, pkgfile->FIELD, (alpm_list_fn_cmp)CMP); \
if(ok == -1) { \
return 1; \
} else if(ok != 0) { \
error = 1; \
} \
} while(0)
if(strcmp(spkg->name, pkgfile->name) != 0) {
_alpm_log(handle, ALPM_LOG_DEBUG,
"internal package name mismatch, expected: '%s', actual: '%s'\n",
@ -1112,11 +1124,13 @@ static int check_pkg_matches_db(alpm_pkg_t *spkg, alpm_pkg_t *pkgfile)
error = 1;
}
error |= check_pkg_field_matches_db(handle, "depends", spkg->depends, pkgfile->depends, (alpm_list_fn_cmp)dep_not_equal);
error |= check_pkg_field_matches_db(handle, "conflicts", spkg->conflicts, pkgfile->conflicts, (alpm_list_fn_cmp)dep_not_equal);
error |= check_pkg_field_matches_db(handle, "replaces", spkg->replaces, pkgfile->replaces, (alpm_list_fn_cmp)dep_not_equal);
error |= check_pkg_field_matches_db(handle, "provides", spkg->provides, pkgfile->provides, (alpm_list_fn_cmp)dep_not_equal);
error |= check_pkg_field_matches_db(handle, "groups", spkg->groups, pkgfile->groups, (alpm_list_fn_cmp)strcmp);
CHECK_FIELD("depends", depends, dep_not_equal);
CHECK_FIELD("conflicts", conflicts, dep_not_equal);
CHECK_FIELD("replaces", replaces, dep_not_equal);
CHECK_FIELD("provides", provides, dep_not_equal);
CHECK_FIELD("groups", groups, strcmp);
#undef CHECK_FIELD
return error;
}