summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@canonical.com>2012-10-14 23:54:21 +0100
committerColin Watson <cjwatson@canonical.com>2012-10-14 23:54:21 +0100
commit4a4a4449f9d83438f57dedc7628c76725d230449 (patch)
treeb9e680841e817da2b810a9c3ec4e2b2aadd3f7f8
parentab0bbca93e3c2e923d3c1497712a0dc366f597ff (diff)
Cherry-pick from http://bzr.debian.org/bzr/apt/apt/debian-sid:
* apt-pkg/pkgcachegen.cc: - add a missing remap registration causing a segfault in case we use the not remapped iterators after a move of the mmap again
-rw-r--r--apt-pkg/pkgcachegen.cc1
-rw-r--r--debian/changelog8
2 files changed, 9 insertions, 0 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 67018f057..03f8aea5a 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -722,6 +722,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
// Fill it in
Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version);
+ Dynamic<pkgCache::VerIterator> DynV(Ver);
Ver->NextVer = Next;
Ver->ID = Cache.HeaderP->VersionCount++;
map_ptrloc const idxVerStr = WriteStringInMap(VerStr);
diff --git a/debian/changelog b/debian/changelog
index e2b24bc75..6a57cf5c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
apt (0.9.7.5ubuntu4) UNRELEASED; urgency=low
+ [ Colin Watson ]
* apt-pkg/pkgcachegen.cc:
- Fix crash if the cache is remapped while writing a Provides version
(LP: #1066445).
+ Cherry-pick from http://bzr.debian.org/bzr/apt/apt/debian-sid:
+
+ [ David Kalnischkies ]
+ * apt-pkg/pkgcachegen.cc:
+ - add a missing remap registration causing a segfault in case
+ we use the not remapped iterators after a move of the mmap again
+
-- Colin Watson <cjwatson@ubuntu.com> Sun, 14 Oct 2012 23:42:31 +0100
apt (0.9.7.5ubuntu3) quantal-proposed; urgency=low