Просмотр исходного кода

* apt-pkg/cdrom.cc:
- fix off-by-one error in DropBinaryArch

Michael Vogt лет назад: 16
Родитель
Сommit
73dfa04154
2 измененных файлов с 5 добавлено и 1 удалено
  1. 1 1
      apt-pkg/cdrom.cc
  2. 4 0
      debian/changelog

+ 1 - 1
apt-pkg/cdrom.cc

@@ -229,7 +229,7 @@ bool pkgCdrom::DropBinaryArch(vector<string> &List)
       // Between Start and End is the architecture
       Start += 8;
       if ((End = strstr(Start,"/")) != 0 && Start != End &&
-          APT::Configuration::checkArchitecture(string(Start, --End)) == true)
+          APT::Configuration::checkArchitecture(string(Start, End)) == true)
 	 continue; // okay, architecture is accepted
 
       // not accepted -> Erase it

+ 4 - 0
debian/changelog

@@ -4,6 +4,10 @@ apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low
   * apt-pkg/pkgcache.cc:
     - re-evaluate the architectures cache when the cache is (re)opened
 
+  [ Colin Watson ]
+  * apt-pkg/cdrom.cc:
+    - fix off-by-one error in DropBinaryArch
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 17:37:14 +0200
 
 apt (0.7.26~exp12) experimental; urgency=low