summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-04-05 12:06:10 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-04-05 12:06:10 +0200
commitbdb3d92cd2d96909eecc5d972206dc761f278381 (patch)
tree0c93d9094039a64634ccb9ff73eb5105c2325512
parent70d761713bf1b1b4520079161708f66e8e3a4e31 (diff)
* apt-pkg/aptconfiguration.cc:
- fix comparing for a empty string
-rw-r--r--apt-pkg/aptconfiguration.cc2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 14ee09e0d..ca602d4bf 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -337,7 +337,7 @@ std::vector<std::string> const Configuration::getArchitectures(bool const &Cache
char* arch = strtok(buf, " ");
while (arch != NULL) {
for (; isspace(*arch) != 0; ++arch);
- if (arch != '\0') {
+ if (arch[0] != '\0') {
char const* archend = arch;
for (; isspace(*archend) == 0 && *archend != '\0'; ++archend);
archs.push_back(string(arch, (archend - arch)));
diff --git a/debian/changelog b/debian/changelog
index 46d677421..98efce3af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ apt (0.8.13.3) unstable; urgency=low
[ Michael Vogt ]
* mirror method:
- do not crash if the mirror file fails to download
+ * apt-pkg/aptconfiguration.cc:
+ - fix comparing for a empty string
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Mar 2011 15:56:54 +0100