From bbd8308cc01941e51e2cbcf88168a5560abe6042 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 19 Jul 2016 18:05:13 +0200 Subject: ensure Cnf::FindFile doesn't return files below /dev/null Very unlikely, but if the parent is /dev/null, the child empty and the grandchild a value we returned /dev/null/value which doesn't exist, so hardly a problem, but for best operability we should be consistent in our work and return /dev/null always. --- apt-pkg/contrib/configuration.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'apt-pkg/contrib/configuration.cc') diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 3cb7fde06..9007bf9ec 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -225,15 +225,7 @@ string Configuration::FindFile(const char *Name,const char *Default) const } result.append(val); } - - // do some normalisation by removing // and /./ from the path - size_t found = string::npos; - while ((found = result.find("/./")) != string::npos) - result.replace(found, 3, "/"); - while ((found = result.find("//")) != string::npos) - result.replace(found, 2, "/"); - - return result; + return flNormalize(result); } /*}}}*/ // Configuration::FindDir - Find a directory name /*{{{*/ -- cgit v1.2.3