summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2024-02-20 08:31:44 +0000
committerJulian Andres Klode <jak@debian.org>2024-02-20 08:31:44 +0000
commit014d0ccfa0ade684e2b650fda3e8d3ffd4d7b431 (patch)
treede8cde0eaf9c9be4fead9af1a1c89c0492f0e916 /apt-pkg/contrib
parent59cd4953f5330cd44facf893ba9f5fbdc618ce6c (diff)
parentc476086e9336b681d365cd18ce1c96135a1ddb31 (diff)
Merge branch 'prevent_read_conf_inf_loop' into 'main'
Prevent infinite loop in `ReadConfigFile` See merge request apt-team/apt!314
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/configuration.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 1134ed667..a5f97729c 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -858,7 +858,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio
int CurLine = 0;
bool InComment = false;
- while (F.Eof() == false)
+ while (F.Eof() == false && F.Failed() == false)
{
// The raw input line.
std::string Input;