Minor fixes

[apt.git] / apt-pkg / tagfile.cc

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index a2f9c0251179bc86da736d7f04e1b482c283ca12..9a581c3e86ce5dc93e9c8d3ca65ab81baf46716c 100644 (file)
--- 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.22 1999/01/31 21:52:27 jgg Exp $
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
@@ -139,8 +139,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 +155,10 @@ 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++);