diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-06 07:51:45 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-06 07:51:45 +0100 |
| commit | 1b4560fec66a6e7b2dff9aaa19095fb8423f69a0 (patch) | |
| tree | 7fb2b63e31f356ef87af4699ba87b4f1443f508c /apt-pkg/tagfile.cc | |
| parent | 81d183681aea972fddd453d62109f8ccda3f447a (diff) | |
| parent | 74d4bb26e09146b9d5f01889a676dc58ff5d63cd (diff) | |
Merge branch 'debian/sid' into feature/apt-manpage
Diffstat (limited to 'apt-pkg/tagfile.cc')
| -rw-r--r-- | apt-pkg/tagfile.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index e0802e3d5..bef3c76ba 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -259,7 +259,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) TagCount = 0; while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End) { - TrimRecord(true,End); + TrimRecord(true,End); + + // this can happen when TrimRecord trims away the entire Record + // (e.g. because it just contains comments) + if(Stop == End) + return true; // Start a new index and add it to the hash if (isspace(Stop[0]) == 0) @@ -273,7 +278,9 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) if (Stop == 0) return false; - for (; Stop+1 < End && Stop[1] == '\r'; Stop++); + for (; Stop+1 < End && Stop[1] == '\r'; Stop++) + /* nothing */ + ; // Double newline marks the end of the record if (Stop+1 < End && Stop[1] == '\n') |