From fdf9eef4d96a18d0167708499c993e1174251e88 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 20 May 2016 09:37:24 +0200
Subject: fail instead of segfault on unreadable config files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 apt-pkg/policy.cc | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'apt-pkg/policy.cc')

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)
-- 
cgit v1.2.3