summaryrefslogtreecommitdiffstats
path: root/lib/libalpm
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2008-07-16 15:27:37 +0200
committerDan McGee <dan@archlinux.org>2008-07-18 03:20:06 +0200
commit59295081982b33640f4e16589ef281872da540b5 (patch)
tree2d48097109b8b7ea014e2163f7f5f9a0c5963e2d /lib/libalpm
parent03021713e5315312b150e6ac9c5cf48fe68f7615 (diff)
downloadpacman-59295081982b33640f4e16589ef281872da540b5.tar.gz
pacman-59295081982b33640f4e16589ef281872da540b5.tar.xz
Fix a possible segfault in alpm/remove.c
Before removing a package from target list (in remove_prepare_keep_needed), we should check whether we have already removed it. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/remove.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 625abe67..864fafaf 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -120,6 +120,9 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
pmdepmissing_t *miss = (pmdepmissing_t *)i->data;
void *vpkg;
pmpkg_t *pkg = _alpm_pkg_find(trans->packages, miss->causingpkg);
+ if(pkg == NULL) {
+ continue;
+ }
trans->packages = alpm_list_remove(trans->packages, pkg, _alpm_pkg_cmp,
&vpkg);
pkg = vpkg;