diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:36 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:52:36 +0000 |
| commit | 90d642804ca96ba640d2c2fbd0620b69670ee827 (patch) | |
| tree | 1dfec4d081fab25f2c6fa2ebf5ec133052cd6a09 /apt-pkg/tagfile.cc | |
| parent | b780bc1b1e5feaddb6ceee8c596d95e013d16dc5 (diff) | |
Hopefully fixed the scan bug
Author: jgg
Date: 1999-01-31 07:01:11 GMT
Hopefully fixed the scan bug
Diffstat (limited to 'apt-pkg/tagfile.cc')
| -rw-r--r-- | apt-pkg/tagfile.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index a2f9c0251..bdfa302d8 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.21 1999/01/31 07:01:11 jgg Exp $ /* ###################################################################### Fast scanner for RFC-822 type header information @@ -141,6 +141,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) TagCount = 0; while (TagCount < sizeof(Indexes)/sizeof(Indexes[0])) { + // 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 or end of file 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++); |