pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(config_parser): Gracefully handle BOM (#2166)

Browse Source 
* fix(config_parser): Gracefully handle BOM

* Move check to parse_line function

And clarify the error message

Closes #2075
This commit is contained in:
Nolan Prochnau 2020-08-15 06:02:23 -04:00 committed by GitHub
parent a4dd2a93d6
commit 2f4cffc0fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/config_parser.cpp
View File

@ -1,8 +1,8 @@
#include "components/config_parser.hpp"
#include <algorithm>
#include <fstream>
#include "components/config_parser.hpp"
POLYBAR_NS
config_parser::config_parser(const logger& logger, string&& file, string&& bar)
@ -151,6 +151,11 @@ void config_parser::parse_file(const string& file, file_list path) {
}
line_t config_parser::parse_line(const string& line) {
if (string_util::contains(line, "\ufeff")) {
throw syntax_error(
"This config file uses UTF-8 with BOM, which is not supported. Please use plain UTF-8 without BOM.");
}
string line_trimmed = string_util::trim(line, isspace);
line_type type = get_line_type(line_trimmed);
@ -193,12 +198,13 @@ line_type config_parser::get_line_type(const string& line) {
case '#':
return line_type::COMMENT;
default:
default: {
if (string_util::contains(line, "=")) {
return line_type::KEY;
} else {
return line_type::UNKNOWN;
}
}
}
}

2
tests/unit_tests/components/config_parser.cpp
View File

@ -1,4 +1,5 @@
#include "components/config_parser.hpp"
#include "common/test.hpp"
#include "components/logger.hpp"
@ -98,6 +99,7 @@ TEST_P(ParseLineKeyTest, correctness) {
TEST_F(ParseLineInValidTest, throwsSyntaxError) {
EXPECT_THROW(parser->parse_line("unknown"), syntax_error);
EXPECT_THROW(parser->parse_line("\ufeff"), syntax_error);
}
// }}}