Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7da890a73764b6659dc6e0e4e71da4d8b52dc8b7

commit 7da890a73764b6659dc6e0e4e71da4d8b52dc8b7
Author: Michel Hermier <[email protected]>
Date:   Mon Dec 9 20:49:14 2013 +0100

libpacman: Fix deletion of pmgrp_t::packages.

diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c
index fb48760..c5b12bf 100644
--- a/lib/libpacman/cache.c
+++ b/lib/libpacman/cache.c
@@ -213,7 +213,7 @@ int _pacman_db_load_grpcache(pmdb_t *db)

if(strcmp(grp->name, i->data) == 0) {
if(!_pacman_list_is_strin(pkg->name, grp->packages)) {
-                                                       grp->packages = 
_pacman_list_add_sorted(grp->packages, (char *)pkg->name, _pacman_grp_cmp);
+                                                       grp->packages = 
_pacman_list_add_sorted(grp->packages, pkg->name, _pacman_grp_cmp);
}
}
}
diff --git a/lib/libpacman/group.c b/lib/libpacman/group.c
index c873748..b737ac0 100644
--- a/lib/libpacman/group.c
+++ b/lib/libpacman/group.c
@@ -50,7 +50,7 @@ void _pacman_grp_delete(pmgrp_t *grp)
return;
}

-       FREELIST(grp->packages);
+       f_ptrlist_delete(grp->packages, NULL);
free(grp);
}

diff --git a/lib/libpacman/group.h b/lib/libpacman/group.h
index dfa41ce..8fd0568 100644
--- a/lib/libpacman/group.h
+++ b/lib/libpacman/group.h
@@ -28,7 +28,7 @@
/* Groups structure */
struct __pmgrp_t {
char name[GRP_NAME_LEN];
-       pmlist_t *packages; /* List of strings */
+       pmlist_t *packages; /* List of unowned strings */
};

pmgrp_t *_pacman_grp_new(void);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to