coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-06 17:59:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Read the stream byte by byte, condition for size when skipping BOM.

Browse Source
This commit is contained in:
Alek Mosingiewicz 2018-05-24 21:38:47 +02:00
parent 4ada12a34c
commit ac10575b5f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,15 +207,18 @@ namespace chaiscript
/// Skip BOM at the beginning of file /// Skip BOM at the beginning of file
static bool skip_bom(std::ifstream &infile) { static bool skip_bom(std::ifstream &infile) {
size_t bytes_needed = 3; size_t bytes_needed = 3;
std::vector<char> v(bytes_needed); size_t bytes_read = 0;
char buffer[256];
infile.read(&v[0], static_cast<std::streamsize>(bytes_needed)); while (bytes_read < bytes_needed) {
std::string buffer_string(v.begin(), v.end()); infile >> buffer;
bytes_read++;
}
if (!infile.eof() if (bytes_needed == bytes_read
&& (buffer_string[0] == '\xef') && (buffer[0] == '\xef')
&& (buffer_string[1] == '\xbb') && (buffer[1] == '\xbb')
&& (buffer_string[2] == '\xbf')) { && (buffer[2] == '\xbf')) {
infile.seekg(3); infile.seekg(3);
return true; return true;
@ -239,7 +242,7 @@ namespace chaiscript
assert(size >= 0); assert(size >= 0);
if (skip_bom(infile)) { if (size >= 3 && skip_bom(infile)) {
size-=3; // decrement the BOM size from file size, otherwise we'll get parsing errors size-=3; // decrement the BOM size from file size, otherwise we'll get parsing errors
assert(size >=0 ); //and check if there's more text assert(size >=0 ); //and check if there's more text
} }