summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-05-20 09:37:24 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-05-20 09:37:24 +0200
commitfdf9eef4d96a18d0167708499c993e1174251e88 (patch)
tree049dd9a8405ac4a3a489a02475ad57235e1538f5 /apt-pkg
parent91be4122fb4dba065c19ea3f292b1945a94b5d99 (diff)
fail instead of segfault on unreadable config files
The report mentions "apt list --upgradable", but there are others which have inconsistent behavior ranging from segfaulting to doing something with the partial (and hence incomplete) data. We had a recent report about sources.list (#818628), this one mentions prefences, the obvious next step is conf files… so the testcase is adapted to check for all three in file and directory versions and run a bunch of commands each time which should all have more or less the same behavior in such a case (aka error out). Closes: 824503
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/cachefile.cc3
-rw-r--r--apt-pkg/policy.cc5
2 files changed, 8 insertions, 0 deletions
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 0e2192973..b5f32fc29 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -173,6 +173,9 @@ bool pkgCacheFile::BuildPolicy(OpProgress * /*Progress*/)
/* */
bool pkgCacheFile::BuildDepCache(OpProgress *Progress)
{
+ if (BuildCaches(Progress, false) == false)
+ return false;
+
std::unique_ptr<pkgDepCache> DCache;
if (this->DCache != NULL)
return true;
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index eb90daca7..2bdd96d8c 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -316,7 +316,12 @@ bool ReadPinDir(pkgPolicy &Plcy,string Dir)
return true;
}
+ _error->PushToStack();
vector<string> const List = GetListOfFilesInDir(Dir, "pref", true, true);
+ bool const PendingErrors = _error->PendingError();
+ _error->MergeWithStack();
+ if (PendingErrors)
+ return false;
// Read the files
for (vector<string>::const_iterator I = List.begin(); I != List.end(); ++I)