summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2006-12-01 14:36:26 +0100
committerMichael Vogt <egon@bottom>2006-12-01 14:36:26 +0100
commit6cc61a167355711ef3494ce807d5ab24c63eae3f (patch)
tree83cb24f56919ab6387ef0450db8821e56be2520c
parentec759a799176881468b85f14c37d3964e199effb (diff)
parentf88137b8972f57c52bbadf54a80932f225562a95 (diff)
* merged from main
-rw-r--r--apt-pkg/deb/debsrcrecords.cc2
-rw-r--r--debian/changelog6
2 files changed, 6 insertions, 2 deletions
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 17645a5ac..e1c6427e8 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -36,7 +36,7 @@ const char **debSrcRecordParser::Binaries()
if (Bins.empty() == true || Bins.length() >= 102400)
return 0;
- if (Bins.length() > BufSize)
+ if (Bins.length() >= BufSize)
{
delete [] Buffer;
// allocate new size based on buffer (but never smaller than 4000)
diff --git a/debian/changelog b/debian/changelog
index 1236aa5af..c83d5e350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,11 @@ apt (0.6.46.4) unstable; urgency=low
- added "Dpkg::StopOnError" variable that controls if apt
will abort on errors from dpkg
* apt-pkg/deb/debsrcrecords.{cc,h}:
- - make the Buffer dynmaic
+ - make the Buffer grow dynmaically (closes: #400874)
+ * Merged from Christian Perrier bzr branch:
+ - uk.po: New Ukrainian translation: 483t28f3u
+ - el.po: Update to 503t9f2u
+ - de.po: Updates and corrections.
--