Fixed reinstreq segfault

Author: jgg
Date: 2001-05-07 02:15:33 GMT
Fixed reinstreq segfault

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index e1f9edb2a23bb2462525f50c814a915f0541f0d9..a2e93dd3b20b1cf3e4fbb74f54ba7b266f57f00b 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: algorithms.cc,v 1.34 2001/04/06 05:40:03 jgg Exp $
+// $Id: algorithms.cc,v 1.35 2001/05/07 02:15:33 jgg Exp $
 /* ######################################################################
 
    Algorithms - A set of misc algorithms
@@ -217,7 +217,7 @@ bool pkgApplyStatus(pkgDepCache &Cache)
       if (I->InstState == pkgCache::State::ReInstReq ||
          I->InstState == pkgCache::State::HoldReInstReq)
       {
-        if (I.CurrentVer().Downloadable() == true)
+        if (I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true)
            Cache.MarkKeep(I);
         else
         {
@@ -238,7 +238,7 @@ bool pkgApplyStatus(pkgDepCache &Cache)
            re-unpacked (probably) */
         case pkgCache::State::UnPacked:
         case pkgCache::State::HalfConfigured:
-        if (I.CurrentVer().Downloadable() == true || 
+        if ((I->CurrentVer != 0 && I.CurrentVer().Downloadable() == true) ||
             I.State() != pkgCache::PkgIterator::NeedsUnpack)
            Cache.MarkKeep(I);
         else