diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:41 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:58:41 +0000 |
| commit | fd71171a9f0e07c3bba58e6ab7478609d97b7058 (patch) | |
| tree | 0c265df5a9ca0f32ca90558d73e0a6db76d5b889 /apt-pkg | |
| parent | d3fc006193f9a2c647651347d556b992de3a1fab (diff) | |
| download | apt-fd71171a9f0e07c3bba58e6ab7478609d97b7058.tar.gz | |
Fixes from Christoph Pfisterer
Author: jgg
Date: 2001-10-04 05:13:23 GMT
Fixes from Christoph Pfisterer
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/tagfile.cc | 8 | ||||
| -rw-r--r-- | apt-pkg/tagfile.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 49330bad5..45913877d 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.30 2001/05/14 05:56:26 jgg Exp $ +// $Id: tagfile.cc,v 1.31 2001/10/04 05:13:23 jgg Exp $ /* ###################################################################### Fast scanner for RFC-822 type header information @@ -197,7 +197,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) return false; TagCount = 0; - while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End) + while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End) { // Start a new index and add it to the hash if (isspace(Stop[0]) == 0) @@ -211,13 +211,13 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) if (Stop == 0) return false; - for (; Stop[1] == '\r' && Stop+1 < End; Stop++); + for (; Stop+1 < End && Stop[1] == '\r'; Stop++); // 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++); + for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++); return true; } diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index f7f1bb42c..86faac16c 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: tagfile.h,v 1.17 2001/04/22 05:42:52 jgg Exp $ +// $Id: tagfile.h,v 1.18 2001/10/04 05:13:23 jgg Exp $ /* ###################################################################### Fast scanner for RFC-822 type header information @@ -34,7 +34,7 @@ class pkgTagSection // We have a limit of 256 tags per section. unsigned short Indexes[256]; - unsigned short AlphaIndexes[0xff]; + unsigned short AlphaIndexes[0x100]; unsigned int TagCount; |