diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-07-19 18:05:13 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-07-19 18:05:13 +0200 |
| commit | bbd8308cc01941e51e2cbcf88168a5560abe6042 (patch) | |
| tree | 1f82c7a91ed12c584bc7fa8f91e31397d37d69d5 /apt-pkg/contrib/configuration.cc | |
| parent | 87f99f6fa701d2557811134380c1f232cf07a422 (diff) | |
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.
Diffstat (limited to 'apt-pkg/contrib/configuration.cc')
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 10 |
1 files changed, 1 insertions, 9 deletions
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 /*{{{*/ |