luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #292 from antmicro/msieron/send-only-declared-bytes 

bitparser: check bitstream length in the file
This commit is contained in:
Gwenhael Goavec-Merou 2023-01-20 10:14:38 +01:00 committed by GitHub
parent 13b232b366 d127fb9554
commit bf6d692196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bitparser.cpp
View File

@ -109,10 +109,21 @@ int BitParser::parse()
/* process all field */
int pos = parseHeader();
/* rest of the file is data to send */
_bit_data.resize(_raw_data.size() - pos);
std::move(_raw_data.begin() + pos, _raw_data.end(), _bit_data.begin());
_bit_length = _bit_data.size();
/* _bit_length is length of data to send */
int rest_of_file_length = _file_size - pos;
if (_bit_length < rest_of_file_length) {
printWarn("File is longer than bitstream length declared in the header: " +
std::to_string(rest_of_file_length) + " vs " + std::to_string(_bit_length)
);
} else if (_bit_length > rest_of_file_length) {
printError("File is shorter than bitstream length declared in the header: " +
std::to_string(rest_of_file_length) + " vs " + std::to_string(_bit_length)
);
return 1;
}
_bit_data.resize(_bit_length);
std::move(_raw_data.begin() + pos, _raw_data.begin() + pos + _bit_length, _bit_data.begin());
if (_reverseOrder) {
for (int i = 0; i < _bit_length; i++) {