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

Fix null pointer dereference but .cquery + header only still does not work

Browse Source
This commit is contained in:
Fangrui Song 2018-01-15 17:30:26 -08:00
parent 804c9c8b1e
commit 22aa939d3d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/project.cc
View File

@ -479,16 +479,19 @@ Project::Entry Project::FindCompilationEntryForFile(
Project::Entry result;
result.is_inferred = true;
result.filename = filename;
if (best_entry)
if (!best_entry)
result.args.push_back(filename);
else {
result.args = best_entry->args;
// |best_entry| probably has its own path in the arguments. We need to remap
// that path to the new filename.
std::string best_entry_base_name = GetBaseName(best_entry->filename);
for (std::string& arg : result.args) {
if (arg == best_entry->filename ||
GetBaseName(arg) == best_entry_base_name) {
arg = filename;
// |best_entry| probably has its own path in the arguments. We need to remap
// that path to the new filename.
std::string best_entry_base_name = GetBaseName(best_entry->filename);
for (std::string& arg : result.args) {
if (arg == best_entry->filename ||
GetBaseName(arg) == best_entry_base_name) {
arg = filename;
}
}
}