summaryrefslogtreecommitdiff
path: root/apt-pkg/tagfile.cc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:52:38 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:52:38 +0000
commitf3bcc38396ab3a7ad5c2e299a5f4e036b2cd06b3 (patch)
tree55dc9f3a8179b76628ffe153230ce3f37aeb4465 /apt-pkg/tagfile.cc
parentcf544e1458bbe2a245ce0275f3b69061604ecf2e (diff)
Fixed another oops
Author: jgg Date: 1999-01-31 21:52:27 GMT Fixed another oops
Diffstat (limited to 'apt-pkg/tagfile.cc')
-rw-r--r--apt-pkg/tagfile.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index bdfa302d8..9a581c3e8 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.21 1999/01/31 07:01:11 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,7 +139,7 @@ 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)
@@ -157,8 +157,8 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
return false;
for (; Stop[1] == '\r' && Stop+1 < End; Stop++);
- // Double newline or end of file marks the end of the record
- if (Stop+1 >= End || 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++);