Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected YAML file parsing

Browse Source 
* Fixes #2323.
* YAML file parsing will now properly catch and display warnings when unable to read a file.
Thanks to @CairoLee!
This commit is contained in:
aleos 2017-08-08 20:50:09 -04:00
parent 4a28c8c1b0
commit dcbb2df776
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/yaml-cpp/src/parse.cpp vendored
View File

@ -31,7 +31,7 @@ Node Load(std::istream& input) {
Node LoadFile(const std::string& filename) { Node LoadFile(const std::string& filename) {
std::ifstream fin(filename.c_str()); std::ifstream fin(filename.c_str());
if (!fin) { if (fin.bad()) {
throw BadFile(); throw BadFile();
} }
return Load(fin); return Load(fin);

2
src/common/yamlwrapper.cpp
View File

@ -47,6 +47,8 @@ yamlwrapper* yaml_load_file(const char* file_name) {
node = YAML::LoadFile(file_name); node = YAML::LoadFile(file_name);
if (!node.IsDefined()) if (!node.IsDefined())
return NULL; return NULL;
if (node.IsNull())
return NULL;
} catch (YAML::ParserException &e) { } catch (YAML::ParserException &e) {
ShowError("YAML Exception Caught: %s\n", e.what()); ShowError("YAML Exception Caught: %s\n", e.what());
return NULL; return NULL;