Fixed another parser glitch

Author: jgg
Date: 1999-02-22 03:30:06 GMT
Fixed another parser glitch

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

-// $Id: debrecords.cc,v 1.4 1999/01/27 02:48:53 jgg Exp $
+// $Id: debrecords.cc,v 1.5 1999/02/22 03:30:06 jgg Exp $

 /* ######################################################################
    
    Debian Package Records - Parser for debian package records
 /* ######################################################################
    
    Debian Package Records - Parser for debian package records


@@ -18,7 +18,8 @@
 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // RecordParser::debRecordParser - Constructor                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-debRecordParser::debRecordParser(FileFd &File) : Tags(File,4*1024)
+debRecordParser::debRecordParser(FileFd &File,pkgCache &Cache) : 
+                   Tags(File,Cache.Head().MaxVerFileSize + 20)

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 68fe0f6a665ddd1480fde97c11c0804b083eeff0..0c204492a907f9a4fd781a212024ab9ab3bd7c1c 100644 (file)
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: debrecords.h,v 1.3 1998/11/13 04:23:38 jgg Exp $
+// $Id: debrecords.h,v 1.4 1999/02/22 03:30:06 jgg Exp $

 /* ######################################################################
    
    Debian Package Records - Parser for debian package records
 /* ######################################################################
    
    Debian Package Records - Parser for debian package records


@@ -44,7 +44,7 @@ class debRecordParser : public pkgRecords::Parser
    virtual string ShortDesc();
    virtual string LongDesc();
    
    virtual string ShortDesc();
    virtual string LongDesc();
    

-   debRecordParser(FileFd &File);
+   debRecordParser(FileFd &File,pkgCache &Cache);

 };
 
 
 };
 
 

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

-// $Id: pkgrecords.cc,v 1.4 1998/11/13 04:23:34 jgg Exp $
+// $Id: pkgrecords.cc,v 1.5 1999/02/22 03:30:06 jgg Exp $

 /* ######################################################################
    
    Package Records - Allows access to complete package description records
 /* ######################################################################
    
    Package Records - Allows access to complete package description records


@@ -40,7 +40,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
         return;
       
       // Create the parser
         return;
       
       // Create the parser

-      Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File);
+      Files[I->ID].Parse = new debRecordParser(*Files[I->ID].File,Cache);

       if (_error->PendingError() == true)
         return;
    }   
       if (_error->PendingError() == true)
         return;
    }   

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 5d45b59bcb33ed2afd81863aa0b182587dc2ff38..53e1e5e8bfc29b469bbb55c87a8dcb3f6f66e756 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.23 1999/02/21 08:38:53 jgg Exp $
+// $Id: tagfile.cc,v 1.24 1999/02/22 03:30:06 jgg Exp $

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


@@ -127,8 +127,11 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
       return false;
    
    if (Tag.Scan(Start,End - Start) == false)
       return false;
    
    if (Tag.Scan(Start,End - Start) == false)

+   {
+      cout << string(Start,End) << endl;

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

-  
+   }
+   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -212,9 +215,12 @@ bool pkgTagSection::Find(const char *Tag,const char *&Start,
       // Strip off the gunk from the start end
       Start = C;
       End = Section + Indexes[I+1];
       // Strip off the gunk from the start end
       Start = C;
       End = Section + Indexes[I+1];

+      if (Start >= End)
+        return _error->Error("Internal parsing error");
+      

       for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++);
       for (; isspace(End[-1]) != 0 && End > Start; End--);
       for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++);
       for (; isspace(End[-1]) != 0 && End > Start; End--);

-
+      

       return true;
    }
    
       return true;
    }
    


@@ -286,5 +292,3 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-
-