diff options
| author | martin@piware.de <> | 2010-06-11 18:59:06 +0200 |
|---|---|---|
| committer | martin@piware.de <> | 2010-06-11 18:59:06 +0200 |
| commit | b26e2415ee2d4f611966488954f8d4f30fcf827c (patch) | |
| tree | 6f881636a8301f382b65f191415b9a49b17061c8 | |
| parent | f4782b42840c1f86c40a59690698ccf6920e990a (diff) | |
* apt-pkg/acquire-item.cc:
- Fix return value of pkgAcqFile::Custom600Headers() in the non-index
case, to avoid returning NULL and causing crashers in callers. This also
fixes a compiler warning.
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 83fb5328b..bcfe6a98a 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1688,5 +1688,7 @@ string pkgAcqFile::Custom600Headers() { if (IsIndexFile) return "\nIndex-File: true"; + else + return ""; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 017e774ba..380060aa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * Add test/test-indexes.sh: - Test behaviour of index retrieval and usage, in particular with uncompressed and gzip compressed indexes. + * apt-pkg/acquire-item.cc: + - Fix return value of pkgAcqFile::Custom600Headers() in the non-index + case, to avoid returning NULL and causing crashers in callers. This also + fixes a compiler warning. -- Christian Perrier <bubulle@debian.org> Tue, 11 May 2010 19:52:00 +0200 |