* 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.

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 83fb5328b34f3befe871951285098c7fa1210c91..bcfe6a98a164f8946e1a1d21486c1ae8c309651f 100644 (file)
--- 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 017e774ba78c65b89c75537c9ca2e520f78137da..380060aa6d5ebdcf05e503d888f765e306240112 100644 (file)
--- 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