X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/cdcc6d34b0256aa5efe159351bb24b2e28ed143b..c1e78ee5a2697afc0902d1be294d71de93090909:/apt-pkg/tagfile.cc

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index a2f9c0251..53e1e5e8b 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: tagfile.cc,v 1.20 1999/01/27 02:48:52 jgg Exp $
+// $Id: tagfile.cc,v 1.24 1999/02/22 03:30:06 jgg Exp $
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
@@ -46,7 +46,7 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
 	 return false;
       
       if (Tag.Scan(Start,End - Start) == false)
-	 return _error->Error("Unable to parse package file %s",Fd.Name().c_str());
+	 return _error->Error("Unable to parse package file %s (1)",Fd.Name().c_str());
    }   
    Start += Tag.size();
    iOffset += Tag.size();
@@ -116,11 +116,22 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
       return false;
    End = Start = Buffer;
    
+   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)
-      return _error->Error("Unable to parse package file");
+   {
+      cout << string(Start,End) << endl;
+      return _error->Error("Unable to parse package file %s (2)",Fd.Name().c_str());
+   }
+   
    return true;
 }
 									/*}}}*/
@@ -139,8 +150,9 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       return false;
    
    TagCount = 0;
-   while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]))
+   while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
    {
+      // Start a new index and add it to the hash
       if (isspace(Stop[0]) == 0)
       {
 	 Indexes[TagCount++] = Stop - Section;
@@ -154,9 +166,11 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       
       if (Stop == 0)
 	 return false;
-      for (; Stop[1] == '\r' && Stop < End; Stop++);
+      
+      for (; Stop[1] == '\r' && Stop+1 < End; Stop++);
 
-      if (Stop[1] == '\n')
+      // Double newline marks the end of the record
+      if (Stop+1 < End && Stop[1] == '\n')
       {
 	 Indexes[TagCount] = Stop - Section;
 	 for (; (Stop[0] == '\n' || Stop[0] == '\r') && Stop < End; Stop++);
@@ -165,7 +179,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       
       Stop++;
    }
-   
+
    return false;
 }
 									/*}}}*/
@@ -201,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];
+      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--);
-
+      
       return true;
    }
    
@@ -275,5 +292,3 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
    return true;
 }
 									/*}}}*/
-
-