summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-05-05 10:43:56 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-05-05 10:43:56 +0200
commitb1471fb3f60fdb9f91a45723ca70649204df7bdb (patch)
tree04c1fe655279fabbac4011a45273b0279f628817
parent6007c1d41d5aae7ae22fee89824175f925b9e680 (diff)
parentcda675393c357aeeb7617652f5fe3c77d803229a (diff)
* apt-pkg/deb/debrecords.cc:
- fix max tag buffer size (LP: #545336, closes: #578959)
-rw-r--r--apt-pkg/deb/debrecords.cc3
-rw-r--r--debian/changelog2
2 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 5b8538a46..34ef0d8f2 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -20,7 +20,8 @@
/* */
debRecordParser::debRecordParser(string FileName,pkgCache &Cache) :
File(FileName,FileFd::ReadOnly),
- Tags(&File,Cache.Head().MaxVerFileSize + 200)
+ Tags(&File, std::max(Cache.Head().MaxVerFileSize,
+ Cache.Head().MaxDescFileSize) + 200)
{
}
/*}}}*/
diff --git a/debian/changelog b/debian/changelog
index d414af35a..3ec1617c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,8 @@ apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low
* test/libapt/getlanguages_test.cc:
- Add test for Esperanto that has nocounty associated with them
(LP: #560956)
+ * apt-pkg/deb/debrecords.cc:
+ - fix max tag buffer size (LP: #545336, closes: #578959)
[ Julian Andres Klode ]
* apt-pkg/contrib/weakptr.h: