From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 21 May 2012 17:12:25 +0000 (+0200)
Subject: * apt-pkg/contrib/mmap.cc:
X-Git-Tag: 0.9.5~2^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/6bae2c5108a95267fedcc8f2312e91488ebece8d

* apt-pkg/contrib/mmap.cc:
  - have a dummy SyncToFd around in case of ReadOnly access to a
    compressed file as we otherwise on Close() do not delete[] the
    char buffer but munmap() it… (Closes: #673815)
---

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 160718ea5..2d12b6fe9 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -84,6 +84,7 @@ bool MMap::Map(FileFd &Fd)
       if ((Flags & ReadOnly) != ReadOnly)
 	 return _error->Error("Compressed file %s can only be mapped readonly", Fd.Name().c_str());
       Base = new unsigned char[iSize];
+      SyncToFd = new FileFd();
       if (Fd.Seek(0L) == false || Fd.Read(Base, iSize) == false)
 	 return _error->Error("Compressed file %s can't be read into mmap", Fd.Name().c_str());
       return true;
diff --git a/debian/changelog b/debian/changelog
index b23232c7b..1b58bcd29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ apt (0.9.5) UNRELEASED; urgency=low
   * buildlib/inttypes.h.in:
     - remove inttypes.h compatibility as providing such a c99 types
       compatibility conflicts with the usage of c99 type long long
+  * apt-pkg/contrib/mmap.cc:
+    - have a dummy SyncToFd around in case of ReadOnly access to a
+      compressed file as we otherwise on Close() do not delete[] the
+      char buffer but munmap() it… (Closes: #673815)
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 21 May 2012 15:10:49 +0200