diff options
| -rw-r--r-- | apt-pkg/indexrecords.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index af2639beb..649b6059d 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -173,7 +173,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End, /*{{{*/ Hash = ""; Size = 0; /* Skip over the first blank */ - while ((*Start == '\t' || *Start == ' ' || *Start == '\n') + while ((*Start == '\t' || *Start == ' ' || *Start == '\n' || *Start == '\r') && Start < End) Start++; if (Start >= End) @@ -215,7 +215,8 @@ bool indexRecords::parseSumData(const char *&Start, const char *End, /*{{{*/ EntryEnd = Start; /* Find the end of the third entry (the filename) */ - while ((*EntryEnd != '\t' && *EntryEnd != ' ' && *EntryEnd != '\n') + while ((*EntryEnd != '\t' && *EntryEnd != ' ' && + *EntryEnd != '\n' && *EntryEnd != '\r') && EntryEnd < End) EntryEnd++; diff --git a/debian/changelog b/debian/changelog index 6c1bb0877..9632a7691 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ apt (0.9.7.8) UNRELEASED; urgency=low (LP: #1086997) - quote plus in filenames to work around a bug in the S3 server (LP: #1003633) + * apt-pkg/indexrecords.cc: + - support '\r' in the Release file -- Christian Perrier <bubulle@debian.org> Mon, 24 Dec 2012 07:01:20 +0100 |