* ftparchive/override.cc:

  - Double maximum override line length to 1000 (LP: #1038961).

diff --git a/debian/changelog b/debian/changelog
index 2f6dbbd289b68df5b564bbe42665aea9bcebb4c5..640647e8b0adff161bbbfa8241e991837be2dd66 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.7.1ubuntu2) UNRELEASED; urgency=low
+
+  * ftparchive/override.cc:
+    - Double maximum override line length to 1000 (LP: #1038961).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 20 Aug 2012 12:03:48 +0100
+

 apt (0.9.7.1ubuntu1) quantal; urgency=low
 
   * merged from the debian-sid branch
 apt (0.9.7.1ubuntu1) quantal; urgency=low
 
   * merged from the debian-sid branch

diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index 760c201200c1d0d7a8d21380ad79983941927cfd..af8ec3a8f0c72592a2108c631c11924c93aaa76a 100644 (file)
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -34,7 +34,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
    
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
    

-   char Line[500];
+   char Line[1000];

    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {


@@ -142,7 +142,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
   
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
   

-   char Line[500];
+   char Line[1000];

    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {