sfence
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

override.txt: Fix crash due to CRLF endings (#8439)

master
David G 2019-05-25 18:01:55 +02:00 committed by SmallJoker
parent 627a96cd99
commit 40dadecb6e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nodedef.cpp
View File

@ -1300,8 +1300,11 @@ void NodeDefManager::applyTextureOverrides(const std::string &override_filepath)
int line_c = 0; int line_c = 0;
while (std::getline(infile, line)) { while (std::getline(infile, line)) {
line_c++; line_c++;
if (trim(line).empty()) // Also trim '\r' on DOS-style files
line = trim(line);
if (line.empty())
continue; continue;
std::vector<std::string> splitted = str_split(line, ' '); std::vector<std::string> splitted = str_split(line, ' ');
if (splitted.size() != 3) { if (splitted.size() != 3) {
errorstream << override_filepath errorstream << override_filepath