BigfootDev/flatbuffers-bigfoot
1
0
Fork 0
forked from BigfootDev/flatbuffers
Code Pull Requests Activity

fixes for annotator

Browse Source
This commit is contained in:
Derek Bailey
2022-04-21 11:46:16 -07:00
parent 7165219535
commit 0bbfd4b2e3
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/binary_annotator.cpp
View File

@@ -61,6 +61,14 @@ static bool IsNonZeroRegion(const uint64_t offset, const uint64_t length,
return false; return false;
} }
static bool IsPrintableRegion(const uint64_t offset, const uint64_t length,
const uint8_t *const binary) {
for (uint64_t i = offset; i < offset + length; ++i) {
if (!isprint(binary[i])) { return false; }
}
return true;
}
static BinarySection GenerateMissingSection(const uint64_t offset, static BinarySection GenerateMissingSection(const uint64_t offset,
const uint64_t length, const uint64_t length,
const uint8_t *const binary) { const uint8_t *const binary) {
@@ -168,7 +176,7 @@ uint64_t BinaryAnnotator::BuildHeader(const uint64_t header_offset) {
offset += sizeof(uint32_t); offset += sizeof(uint32_t);
if (IsValidRead(offset, flatbuffers::kFileIdentifierLength) && if (IsValidRead(offset, flatbuffers::kFileIdentifierLength) &&
IsNonZeroRegion(offset, flatbuffers::kFileIdentifierLength, binary_)) { IsPrintableRegion(offset, flatbuffers::kFileIdentifierLength, binary_)) {
BinaryRegionComment comment; BinaryRegionComment comment;
comment.type = BinaryRegionCommentType::FileIdentifier; comment.type = BinaryRegionCommentType::FileIdentifier;
// Check if the file identifier region has non-zero data, and assume its // Check if the file identifier region has non-zero data, and assume its
@@ -1404,8 +1412,8 @@ bool BinaryAnnotator::ContainsSection(const uint64_t offset) {
--it; --it;
// And check that if the offset is covered by the section. // And check that if the offset is covered by the section.
return offset >= it->first && offset <= it->second.regions.back().offset + return offset >= it->first && offset < it->second.regions.back().offset +
it->second.regions.back().length; it->second.regions.back().length;
} }
} // namespace flatbuffers } // namespace flatbuffers