walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

ImportProject: Fix loading of sln without BOM

This commit is contained in:
Daniel Marjamäki 2022-02-08 08:52:27 +01:00
parent 260d155bb6
commit cfe2392709
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/importproject.cpp
View File

@ -466,16 +466,18 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
{ {
std::string line; std::string line;
// skip magic word
if (!std::getline(istr,line)) { if (!std::getline(istr,line)) {
printError("Visual Studio solution file is empty"); printError("Visual Studio solution file is empty");
return false; return false;
} }
if (line.find("Microsoft Visual Studio Solution File") != 0) {
// Skip BOM
if (!std::getline(istr, line) || line.find("Microsoft Visual Studio Solution File") != 0) { if (!std::getline(istr, line) || line.find("Microsoft Visual Studio Solution File") != 0) {
printError("Visual Studio solution file header not found"); printError("Visual Studio solution file header not found");
return false; return false;
} }
}
std::map<std::string,std::string,cppcheck::stricmp> variables; std::map<std::string,std::string,cppcheck::stricmp> variables;
variables["SolutionDir"] = path; variables["SolutionDir"] = path;