diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-05-20 09:37:24 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-05-20 19:48:33 +0200 |
| commit | cde5b485c9cdf0bfd5b6ea8e4973abe378270e60 (patch) | |
| tree | 7b6de7936e1fe5a1f05aa012a6dac475f4a40ef3 /apt-private/private-list.cc | |
| parent | 235347e50c61be5e1813c1a3bbcdd98e61ae57a7 (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
(cherry picked from commit fdf9eef4d96a18d0167708499c993e1174251e88)
Diffstat (limited to 'apt-private/private-list.cc')
| -rw-r--r-- | apt-private/private-list.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc index a948c7d9f..32c8eeaa2 100644 --- a/apt-private/private-list.cc +++ b/apt-private/private-list.cc @@ -93,8 +93,8 @@ static void ListAllVersions(pkgCacheFile &CacheFile, pkgRecords &records,/*{{{*/ bool DoList(CommandLine &Cmd) { pkgCacheFile CacheFile; - pkgCache *Cache = CacheFile.GetPkgCache(); - if (unlikely(Cache == NULL)) + pkgCache * const Cache = CacheFile.GetPkgCache(); + if (unlikely(Cache == nullptr || CacheFile.GetDepCache() == nullptr)) return false; pkgRecords records(CacheFile); |