Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-25 09:05:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #487 dead loop in hierarchical .cquery

Browse Source
This commit is contained in:
Fangrui Song 2018-03-03 14:43:51 -08:00
parent 68b7ed5852
commit df95cd4780
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/project.cc
View File

@ -333,8 +333,12 @@ std::vector<Project::Entry> LoadFromDirectoryListing(Config* init_opts,
auto GetCompilerArgumentForFile = [&config, auto GetCompilerArgumentForFile = [&config,
&folder_args](const std::string& path) { &folder_args](const std::string& path) {
for (std::string cur = GetDirName(path); for (std::string cur = GetDirName(path); ; cur = GetDirName(cur)) {
NormalizePath(cur) != config->project_dir; cur = GetDirName(cur)) { std::string normalized = NormalizePath(cur);
if (normalized.size() <= config->project_dir.size() ||
normalized.compare(0, config->project_dir.size(),
config->project_dir) != 0)
break;
auto it = folder_args.find(cur); auto it = folder_args.find(cur);
if (it != folder_args.end()) { if (it != folder_args.end()) {
return it->second; return it->second;