summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-10-19 08:20:04 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-10-19 08:20:04 +0000
commit7524e34882a4a2c21908da29218dd527e166406a (patch)
treeb6848874468281b910f6ddb974e4a4c7232626e8
parente8cdc56aaf6a12223fb9868784c18c8c0ada6315 (diff)
* fix a crash in apt-ftparchive
-rw-r--r--debian/changelog2
-rw-r--r--ftparchive/writer.cc5
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 78a7f890a..f237e5d69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ apt (0.6.41.1) unstable; urgency=low
* support for apt-get source -t (and honor pining) (closes: #152129)
* added "APT::Authentication::Trust-CDROM" option to make the life
for the installer people easier (closes: #334656)
+ * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
+ (closes: #334671)
--
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 0b68d0bbf..fc9ea27d7 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -581,8 +581,6 @@ bool SourcesWriter::DoPackage(string FileName)
auto_ptr<Override::Item> Itm(BOver.GetItem(BinList[I]));
if (Itm.get() == 0)
continue;
- if (OverItem.get() == 0)
- OverItem = Itm;
unsigned char NewPrioV = debListParser::GetPrio(Itm->Priority);
if (NewPrioV < BestPrioV || BestPrio.empty() == true)
@@ -590,6 +588,9 @@ bool SourcesWriter::DoPackage(string FileName)
BestPrioV = NewPrioV;
BestPrio = Itm->Priority;
}
+
+ if (OverItem.get() == 0)
+ OverItem = Itm;
}
}