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

bitparser: check bitstream length in the file 

It was present before, but for some reason was removed in 16932786.

Signed-off-by: Michal Sieron <msieron@antmicro.com>
This commit is contained in:
Michal Sieron 2023-01-19 21:07:40 +01:00
parent 13b232b366
commit bc53c1d022
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 */ /* process all field */
int pos = parseHeader(); int pos = parseHeader();
/* rest of the file is data to send */ /* _bit_length is length of data to send */
_bit_data.resize(_raw_data.size() - pos); int rest_of_file_length = _raw_data.size() - pos;
std::move(_raw_data.begin() + pos, _raw_data.end(), _bit_data.begin()); if (_bit_length < rest_of_file_length) {
_bit_length = _bit_data.size(); 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) { if (_reverseOrder) {
for (int i = 0; i < _bit_length; i++) { for (int i = 0; i < _bit_length; i++) {