Fix status file parser so that if a record is larger th...

Author: doogie
Date: 2003-04-27 05:59:14 GMT
Fix status file parser so that if a record is larger than 32k, the buffer
size will be doubled, and the read attempted again.

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index da520ed81e3ec449a8351c3957484d76b2007a1f..1e5bc81a4b6b93846101f96882be358791a4a881 100644 (file)
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.cc,v 1.35 2002/11/06 06:43:14 jgg Exp $
+// $Id: tagfile.cc,v 1.36 2003/04/27 05:59:14 doogie Exp $

 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information


@@ -42,6 +42,7 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : Fd(*pFd), Size(Size)
       return;
    }
    
       return;
    }
    

+   CurSize = Size;

    Buffer = new char[Size];
    Start = End = Buffer;
    Done = false;
    Buffer = new char[Size];
    Start = End = Buffer;
    Done = false;


@@ -62,15 +63,23 @@ pkgTagFile::~pkgTagFile()
 /* If the Section Scanner fails we refill the buffer and try again. */
 bool pkgTagFile::Step(pkgTagSection &Tag)
 {
 /* If the Section Scanner fails we refill the buffer and try again. */
 bool pkgTagFile::Step(pkgTagSection &Tag)
 {

-   if (Tag.Scan(Start,End - Start) == false)
-   {
+   pkgTagSection::ScanFlags ret = Tag.Scan(Start,End - Start);
+   if (ret == pkgTagSection::ScanEOF) {
+      CurSize <<= 1;

       if (Fill() == false)
         return false;
       if (Fill() == false)
         return false;

-      
-      if (Tag.Scan(Start,End - Start) == false)
-        return _error->Error(_("Unable to parse package file %s (1)"),
-                             Fd.Name().c_str());
+      do {
+          ret = Tag.Scan(Start,End - Start);
+          if (ret == pkgTagSection::ScanEOF) {
+             CurSize <<= 1;
+             if (Fill() == false)
+                break;
+          }
+      } while (ret == pkgTagSection::ScanEOF);

    }
    }

+   if (ret != pkgTagSection::ScanSuccess)
+      return _error->Error(_("Unable to parse package file %s (1)"),
+                          Fd.Name().c_str());

    Start += Tag.size();
    iOffset += Tag.size();
 
    Start += Tag.size();
    iOffset += Tag.size();
 


@@ -147,14 +156,21 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
    if (Fill() == false)
       return false;
 
    if (Fill() == false)
       return false;
 

-   if (Tag.Scan(Start,End - Start) == true)
-      return true;
-   
-   // This appends a double new line (for the real eof handling)
-   if (Fill() == false)
-      return false;
-   
-   if (Tag.Scan(Start,End - Start) == false)
+   pkgTagSection::ScanFlags ret = Tag.Scan(Start,End - Start);
+   if (ret == pkgTagSection::ScanEOF) {
+      CurSize <<= 1;
+      if (Fill() == false)
+        return false;
+      do {
+          ret = Tag.Scan(Start,End - Start);
+          if (ret == pkgTagSection::ScanEOF) {
+             CurSize <<= 1;
+             if (Fill() == false)
+                break;
+          }
+      } while (ret == pkgTagSection::ScanEOF);
+   }
+   if (ret != pkgTagSection::ScanSuccess)

       return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
    
    return true;
       return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
    
    return true;


@@ -173,14 +189,14 @@ inline static unsigned long AlphaHash(const char *Text, const char *End = 0)
    return Res & 0xFF;
 }
 
    return Res & 0xFF;
 }
 

-bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
+enum pkgTagSection::ScanFlags pkgTagSection::Scan(const char *Start,unsigned long MaxLength)

 {
    const char *End = Start + MaxLength;
    Stop = Section = Start;
    memset(AlphaIndexes,0,sizeof(AlphaIndexes));
 
    if (Stop == 0)
 {
    const char *End = Start + MaxLength;
    Stop = Section = Start;
    memset(AlphaIndexes,0,sizeof(AlphaIndexes));
 
    if (Stop == 0)

-      return false;
+      return ScanError;

    
    TagCount = 0;
    while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
    
    TagCount = 0;
    while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)


@@ -195,7 +211,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       Stop = (const char *)memchr(Stop,'\n',End - Stop);
       
       if (Stop == 0)
       Stop = (const char *)memchr(Stop,'\n',End - Stop);
       
       if (Stop == 0)

-        return false;
+        return ScanEOF;

       
       for (; Stop+1 < End && Stop[1] == '\r'; Stop++);
 
       
       for (; Stop+1 < End && Stop[1] == '\r'; Stop++);
 


@@ -204,13 +220,13 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       {
         Indexes[TagCount] = Stop - Section;
         for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);
       {
         Indexes[TagCount] = Stop - Section;
         for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);

-        return true;
+        return ScanSuccess;

       }
       
       Stop++;
    }
 
       }
       
       Stop++;
    }
 

-   return false;
+   return ScanEOF;

 }
                                                                        /*}}}*/
 // TagSection::Trim - Trim off any trailing garbage                    /*{{{*/
 }
                                                                        /*}}}*/
 // TagSection::Trim - Trim off any trailing garbage                    /*{{{*/

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 86faac16c3b741c9e0c57175b59ab294004abcee..ea2b0d712c41fbea95ac5957cd8dcd200a078e4d 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.h,v 1.18 2001/10/04 05:13:23 jgg Exp $
+// $Id: tagfile.h,v 1.19 2003/04/27 05:59:14 doogie Exp $

 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information


@@ -40,6 +40,7 @@ class pkgTagSection
      
    public:
    
      
    public:
    

+   enum ScanFlags {ScanSuccess=0, ScanError=1, ScanEOF=2};

    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    
    inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
    inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
    


@@ -49,7 +50,7 @@ class pkgTagSection
    signed int FindI(const char *Tag,signed long Default = 0) const ;
    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;
    signed int FindI(const char *Tag,signed long Default = 0) const ;
    bool FindFlag(const char *Tag,unsigned long &Flags,
                 unsigned long Flag) const;

-   bool Scan(const char *Start,unsigned long MaxLength);
+   enum ScanFlags Scan(const char *Start,unsigned long MaxLength);

    inline unsigned long size() const {return Stop - Section;};
    void Trim();
    
    inline unsigned long size() const {return Stop - Section;};
    void Trim();
    


@@ -75,7 +76,7 @@ class pkgTagFile
    bool Done;
    unsigned long iOffset;
    unsigned long Size;
    bool Done;
    unsigned long iOffset;
    unsigned long Size;

-   
+   unsigned long CurSize; 

    bool Fill();
    
    public:
    bool Fill();
    
    public:

diff --git a/debian/changelog b/debian/changelog
index d5e8de3f31d3d305569c87452e8579f6fbecd0f5..aaa69798e3be00b2cef61bd78d1ca13453c3d978 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -120,6 +120,9 @@ apt (0.5.4.9) unstable; urgency=low
     instead of only 1024.
   * APT::Immediate-Configure had inverted semantics(false meant it was
     enabled).  Closes: #173619.
     instead of only 1024.
   * APT::Immediate-Configure had inverted semantics(false meant it was
     enabled).  Closes: #173619.

+  * Fix status file parser so that if a record is larger than 32k, the
+    buffer size will be doubled, and the read attempted again.  Closes:
+    #174945.

 
  -- Adam Heath <doogie@debian.org>  Sun, 02 Feb 2003 02:54:45 -0600
 
 
  -- Adam Heath <doogie@debian.org>  Sun, 02 Feb 2003 02:54:45 -0600