remove the arbitrary MAXLEN limit for response lines (Closes: #658346)

diff --git a/debian/changelog b/debian/changelog
index 8e66fd2fd3c44d84170780d7d573a2e88bc33e4c..0a366a6fbc556d1a9873706d9e365609c0dfd43c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
     - if a file without an extension is requested send an 'Accept: text/*'
       header to avoid that the server chooses unsupported compressed files
       in a content-negotation attempt (Closes: #657560)
     - if a file without an extension is requested send an 'Accept: text/*'
       header to avoid that the server chooses unsupported compressed files
       in a content-negotation attempt (Closes: #657560)

+    - remove the arbitrary MAXLEN limit for response lines (Closes: #658346)

   * apt-pkg/aptconfiguration.cc:
     - chroot if needed before calling dpkg --print-foreign-architectures
     - ensure that architectures are not added multiple times
   * apt-pkg/aptconfiguration.cc:
     - chroot if needed before calling dpkg --print-foreign-architectures
     - ensure that architectures are not added multiple times


@@ -44,7 +45,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
   * apt-pkg/contrib/fileutl.h:
     - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
 
   * apt-pkg/contrib/fileutl.h:
     - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 11 Feb 2012 20:59:13 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 11 Feb 2012 21:23:00 +0100

 
 apt (0.8.16~exp12) experimental; urgency=low
 
 
 apt (0.8.16~exp12) experimental; urgency=low
 

diff --git a/methods/http.cc b/methods/http.cc
index 2721b1224e69afd8025aff8b514e4d110c9abc43..7ddf8e045b729dd21ee2abc606438b6980ea08d4 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -534,10 +534,6 @@ bool ServerState::HeaderLine(string Line)
    if (Line.empty() == true)
       return true;
 
    if (Line.empty() == true)
       return true;
 

-   // The http server might be trying to do something evil.
-   if (Line.length() >= MAXLEN)
-      return _error->Error(_("Got a single header line over %u chars"),MAXLEN);
-

    string::size_type Pos = Line.find(' ');
    if (Pos == string::npos || Pos+1 > Line.length())
    {
    string::size_type Pos = Line.find(' ');
    if (Pos == string::npos || Pos+1 > Line.length())
    {

diff --git a/methods/http.h b/methods/http.h
index c73d4df5ca5252d159ce7fd9c03ddcbc25b80f64..c061ad680de03d28a19e4f3fdaed607eae3d104a 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -11,8 +11,6 @@
 #ifndef APT_HTTP_H
 #define APT_HTTP_H
 
 #ifndef APT_HTTP_H
 #define APT_HTTP_H
 

-#define MAXLEN 360
-

 #include <apt-pkg/strutl.h>
 
 #include <string>
 #include <apt-pkg/strutl.h>
 
 #include <string>


@@ -92,7 +90,7 @@ struct ServerState
    unsigned int Major;
    unsigned int Minor;
    unsigned int Result;
    unsigned int Major;
    unsigned int Minor;
    unsigned int Result;

-   char Code[MAXLEN];
+   char Code[360];

    
    // These are some statistics from the last parsed header lines
    unsigned long long Size;
    
    // These are some statistics from the last parsed header lines
    unsigned long long Size;

diff --git a/methods/https.h b/methods/https.h
index b7adeb88084f32bb762796a318e8227960195178..3b57c7be6285aef55a8f0c0b431a878297e268cd 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -11,8 +11,6 @@
 #ifndef APT_HTTP_H
 #define APT_HTTP_H
 
 #ifndef APT_HTTP_H
 #define APT_HTTP_H
 

-#define MAXLEN 360
-

 #include <iostream>
 #include <curl/curl.h>
 
 #include <iostream>
 #include <curl/curl.h>