From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 2 Aug 2010 19:02:01 +0000 (+0200)
Subject: * apt-pkg/cdrom.cc:
X-Git-Tag: 0.9.13.exp1ubuntu1~280^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/73dfa041545d34b79a4dd25a0baa3e64f5564a62?ds=inline

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

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index e3e0027fc..0e36f44a2 100644
--- a/apt-pkg/cdrom.cc
+++ b/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
diff --git a/debian/changelog b/debian/changelog
index cd0f4d7f6..1d76736a3 100644
--- a/debian/changelog
+++ b/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