summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/package.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libalpm/package.c')
-rw-r--r--lib/libalpm/package.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index ab84329c..4887e215 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -591,17 +591,24 @@ void _alpm_pkg_free(alpm_pkg_t *pkg)
free_deplist(pkg->replaces);
FREELIST(pkg->groups);
if(pkg->files.count) {
- size_t i;
- for(i = 0; i < pkg->files.count; i++) {
- FREE(pkg->files.files[i].name);
- }
- free(pkg->files.files);
+ size_t i, j, k;
if(pkg->files.resolved_path) {
- for(i = 0; i < pkg->files.count; i++) {
+ for(i = 0, j = 0; i < pkg->files.count; i++) {
+ for(k = j; k <= pkg->files.count; k++) {
+ if(pkg->files.resolved_path[i] == pkg->files.files[k].name) {
+ pkg->files.files[k].name = NULL;
+ j = k + 1;
+ break;
+ }
+ }
free(pkg->files.resolved_path[i]);
}
free(pkg->files.resolved_path);
}
+ for(j = 0; j < pkg->files.count; j++) {
+ FREE(pkg->files.files[j].name);
+ }
+ free(pkg->files.files);
}
alpm_list_free_inner(pkg->backup, (alpm_list_fn_free)_alpm_backup_free);
alpm_list_free(pkg->backup);