coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2025-12-06 16:57:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Decrement file size when BOM is present to avoid parsing errors.

Browse Source
This commit is contained in:
Alek Mosingiewicz 2018-05-13 13:09:38 +02:00
parent a024db040d
commit c09af92963
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/chaiscript/language/chaiscript_engine.hpp
View File

@ -207,11 +207,11 @@ namespace chaiscript
/// Skip BOM at the beginning of file
static bool skip_bom(std::ifstream &infile) {
char buffer[4];
size_t bytes_needed = 3;
std::vector<char> v(bytes_needed);
memset(buffer, '\0', 4);
infile.readsome(buffer, 3);
std::string buffer_string(buffer);
infile.read(&v[0], static_cast<std::streamsize>(bytes_needed));
std::string buffer_string(v.begin(), v.end());
if (chaiscript::parser::detail::Char_Parser_Helper<std::string>::has_utf8_bom(buffer_string)) {
infile.seekg(3);
@ -231,12 +231,14 @@ namespace chaiscript
throw chaiscript::exception::file_not_found_error(t_filename);
}
const auto size = infile.tellg();
auto size = infile.tellg();
infile.seekg(0, std::ios::beg);
assert(size >= 0);
skip_bom(infile);
if (skip_bom(infile)) {
size-=3; // decrement the BOM size from file size, otherwise we'll get parsing errors
}
if (size == std::streampos(0))
{