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

Validate extra data when comparing dbpkg to pkgfile

Browse source
This commit is contained in:
morganamilo 2024-02-03 11:17:01 +00:00 • committed by Allan McRae
parent 196de7e94a
commit 386125fc89
1 changed files with 56 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
lib/libalpm/sync.c
View file

@ -1067,6 +1067,61 @@ static int check_validity(alpm_handle_t *handle,
return 0; return 0;
} }
static int dep_not_equal(const alpm_depend_t *left, const alpm_depend_t *right)
{
return left->name_hash != right->name_hash
|| strcmp(left->name, right->name) != 0
|| left->mod != right->mod
|| (left->version == NULL) != (right->version == NULL)
|| ((left->version && right->version) && strcmp(left->version, right->version) != 0);
}
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)) {
_alpm_log(handle, ALPM_LOG_DEBUG,
"internal package %s mismatch\n", field);
return 1;
}
return 0;
}
static int check_pkg_matches_db(alpm_pkg_t *spkg, alpm_pkg_t *pkgfile)
{
alpm_handle_t *handle = spkg->handle;
int error = 0;
if(strcmp(spkg->name, pkgfile->name) != 0) {
_alpm_log(handle, ALPM_LOG_DEBUG,
"internal package name mismatch, expected: '%s', actual: '%s'\n",
spkg->name, pkgfile->name);
error = 1;
}
if(strcmp(spkg->version, pkgfile->version) != 0) {
_alpm_log(handle, ALPM_LOG_DEBUG,
"internal package version mismatch, expected: '%s', actual: '%s'\n",
spkg->version, pkgfile->version);
error = 1;
}
if(spkg->isize != pkgfile->isize) {
_alpm_log(handle, ALPM_LOG_DEBUG,
"internal package install size mismatch, expected: '%ld', actual: '%ld'\n",
spkg->isize, pkgfile->isize);
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);
return error;
}
static int load_packages(alpm_handle_t *handle, alpm_list_t **data, static int load_packages(alpm_handle_t *handle, alpm_list_t **data,
size_t total, size_t total_bytes) size_t total, size_t total_bytes)
{ {
@ -1110,18 +1165,7 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data,
_alpm_log(handle, ALPM_LOG_DEBUG, "failed to load pkgfile internal\n"); _alpm_log(handle, ALPM_LOG_DEBUG, "failed to load pkgfile internal\n");
error = 1; error = 1;
} else { } else {
if(strcmp(spkg->name, pkgfile->name) != 0) { error |= check_pkg_matches_db(spkg, pkgfile);
_alpm_log(handle, ALPM_LOG_DEBUG,
"internal package name mismatch, expected: '%s', actual: '%s'\n",
spkg->name, pkgfile->name);
error = 1;
}
if(strcmp(spkg->version, pkgfile->version) != 0) {
_alpm_log(handle, ALPM_LOG_DEBUG,
"internal package version mismatch, expected: '%s', actual: '%s'\n",
spkg->version, pkgfile->version);
error = 1;
}
} }
if(error != 0) { if(error != 0) {
errors++; errors++;