Fix segfault

4 files changed, 10 insertions, 9 deletions

diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 8e24af4ab..21a5c78e7 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -1235,7 +1235,7 @@ Decider::find_any_score(
     /* explicit preferences come first */
     if (spec.package_ptr())
     {
-        Tribool prefer_or_avoid(_imp->fns.prefer_or_avoid_fn()(spec));
+        Tribool prefer_or_avoid(_imp->fns.prefer_or_avoid_fn()(spec, our_id));
         if (prefer_or_avoid.is_true())
             return std::make_pair(is_block ? acs_avoid : acs_prefer, operator_bias);
         else if (prefer_or_avoid.is_false())
diff --git a/paludis/resolver/prefer_or_avoid_helper.cc b/paludis/resolver/prefer_or_avoid_helper.cc
index 318dfff39..9b8405de1 100644
--- a/paludis/resolver/prefer_or_avoid_helper.cc
+++ b/paludis/resolver/prefer_or_avoid_helper.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2010, 2011, 2014 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -81,7 +81,7 @@ PreferOrAvoidHelper::add_avoid_matching(const std::shared_ptr<const PackageIDSeq
 }
 
 Tribool
-PreferOrAvoidHelper::operator() (const PackageDepSpec & s) const
+PreferOrAvoidHelper::operator() (const PackageDepSpec & s, const std::shared_ptr<const PackageID> & id) const
 {
     if (s.package_ptr())
     {
@@ -97,7 +97,7 @@ PreferOrAvoidHelper::operator() (const PackageDepSpec & s) const
     {
         bool all(true);
         for (auto q((*p)->begin()), q_end((*p)->end()) ; q != q_end ; ++q)
-            if (! match_package(*_imp->env, s, *q, nullptr, { }))
+            if (! match_package(*_imp->env, s, *q, id, { }))
             {
                 all = false;
                 break;
@@ -111,7 +111,7 @@ PreferOrAvoidHelper::operator() (const PackageDepSpec & s) const
             p != p_end ; ++p)
     {
         for (auto q((*p)->begin()), q_end((*p)->end()) ; q != q_end ; ++q)
-            if (match_package(*_imp->env, s, *q, nullptr, { }))
+            if (match_package(*_imp->env, s, *q, id, { }))
                 return false;
     }
 
diff --git a/paludis/resolver/prefer_or_avoid_helper.hh b/paludis/resolver/prefer_or_avoid_helper.hh
index 7d1c6ea13..3d4d45cd2 100644
--- a/paludis/resolver/prefer_or_avoid_helper.hh
+++ b/paludis/resolver/prefer_or_avoid_helper.hh
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2010, 2011, 2014 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -50,7 +50,7 @@ namespace paludis
                 void add_prefer_matching(const std::shared_ptr<const PackageIDSequence> &);
                 void add_avoid_matching(const std::shared_ptr<const PackageIDSequence> &);
 
-                Tribool operator() (const PackageDepSpec &) const;
+                Tribool operator() (const PackageDepSpec &, const std::shared_ptr<const PackageID> &) const;
         };
     }
 
diff --git a/paludis/resolver/resolver_functions.hh b/paludis/resolver/resolver_functions.hh
index ebdeda47e..aefb6de3c 100644
--- a/paludis/resolver/resolver_functions.hh
+++ b/paludis/resolver/resolver_functions.hh
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011, 2014 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -182,7 +182,8 @@ namespace paludis
                 )> OrderEarlyFunction;
 
         typedef std::function<Tribool (
-                const PackageDepSpec &
+                const PackageDepSpec &,
+                const std::shared_ptr<const PackageID> &
                 )> PreferOrAvoidFunction;
 
         typedef std::function<std::shared_ptr<const PackageIDSequence> (