Fix segfault when handling /etc/apt/preferences.

Author: doogie
Date: 2003-05-19 17:58:26 GMT
Fix segfault when handling /etc/apt/preferences.

diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 1abb7e4addcfc7e5ae87524d4d5f941dcf84adaa..9e341852b8fe43fcc273f795ac00338c1f3fd6ac 100644 (file)
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: versionmatch.cc,v 1.8 2003/04/24 03:16:58 doogie Exp $
+// $Id: versionmatch.cc,v 1.9 2003/05/19 17:58:26 doogie Exp $
 /* ######################################################################
 
    Version Matching 
@@ -208,8 +208,12 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    
    if (Type == Origin)
    {
-      if (!strcmp(File.Archive(), "now"))      /* ignore local "status" file */
-        return false;
+      if (OrSite.empty() == false) {
+        if (File->Site == 0 || OrSite != File.Site())
+           return false;
+      } else // so we are talking about file:// or status file
+        if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file
+           return false;
       return (OrSite == File.Site());          /* both strings match */
    }
    

diff --git a/debian/changelog b/debian/changelog
index 1cf2ac3a1e35189bc933ea88199ca5eac35af670..9486e18b6bdfb9b16e40cd16c5ad873aa1934423 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ apt (0.5.5.1) unstable; urgency=low
     backing out change that incorretly attempted to handle Package sections
     larger than 32k.  Closes: #192373
   * Fix never-ending loop with apt-get install -V.  Closes: #192355.
+  * Fix segfault when handling /etc/apt/preferences.  Closes: #192409.
 
  -- Adam Heath <doogie@debian.org>  Mon, 19 May 2003 12:30:16 -0500
 

diff --git a/po/apt-all.pot b/po/apt-all.pot
index c235fd08d5b188e6a548176fb23a3e5732db8d9c..11b07c81fe585d6945271d7471b9d07c8a4930c4 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-19 12:22-0500\n"
+"POT-Creation-Date: 2003-05-19 12:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"