From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 1 Aug 2011 10:57:04 +0000 (+0200)
Subject: apt-pkg/pkgcachegen.cc: copy Arch to avoid segfault on cache remap
X-Git-Tag: 0.8.15.6~5^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/77de0e831a12aedde05ff6bff8fb07dcbb4074ad?hp=-c

apt-pkg/pkgcachegen.cc: copy Arch to avoid segfault on cache remap
---

77de0e831a12aedde05ff6bff8fb07dcbb4074ad
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index efd764b51..2bfb77609 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -636,7 +636,9 @@ bool pkgCacheGenerator::FinishCache(OpProgress *Progress)
 	    Dynamic<pkgCache::VerIterator> DynV(V);
 	    for (; V.end() != true; V++)
 	    {
-	       char const * const Arch = P.Arch();
+               // copy P.Arch() into a string here as a cache remap
+               // in NewDepends() later may alter the pointer location
+	       string Arch = P.Arch() == NULL ? "" : P.Arch();
 	       map_ptrloc *OldDepLast = NULL;
 	       /* MultiArch handling introduces a lot of implicit Dependencies:
 		- MultiArch: same → Co-Installable if they have the same version