github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

rose_build_matchers: fix fragment noruns calc

Browse Source
This commit is contained in:
Justin Viiret 2017-06-23 11:30:24 +10:00 committed by Matthew Barr
parent cc4a5cc36f
commit 2dc1f9d629
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rose/rose_build_matchers.cpp
View File

@ -556,6 +556,17 @@ bool isNoRunsLiteral(const RoseBuildImpl &build, const u32 id,
return true; return true;
} }
static
bool isNoRunsFragment(const RoseBuildImpl &build, const LitFragment &f,
const size_t max_len) {
// For the fragment to be marked "no runs", every literal it fires must
// need no further confirmation work.
return all_of_in(f.lit_ids, [&](u32 lit_id) {
const auto &info = build.literal_info.at(lit_id);
return isNoRunsLiteral(build, lit_id, info, max_len);
});
}
static static
const raw_puff &getChainedPuff(const RoseBuildImpl &build, const raw_puff &getChainedPuff(const RoseBuildImpl &build,
const Report &report) { const Report &report) {
@ -691,15 +702,15 @@ void addFragmentLiteral(const RoseBuildImpl &build, MatcherProto &mp,
const LitFragment &f, u32 id, bool delay_rebuild, const LitFragment &f, u32 id, bool delay_rebuild,
size_t max_len) { size_t max_len) {
const rose_literal_id &lit = build.literals.at(id); const rose_literal_id &lit = build.literals.at(id);
assert(id < build.literal_info.size());
const auto &info = build.literal_info.at(id);
DEBUG_PRINTF("lit='%s' (len %zu)\n", dumpString(lit.s).c_str(), DEBUG_PRINTF("lit='%s' (len %zu)\n", dumpString(lit.s).c_str(),
lit.s.length()); lit.s.length());
vector<u8> msk = lit.msk; // copy vector<u8> msk = lit.msk; // copy
vector<u8> cmp = lit.cmp; // copy vector<u8> cmp = lit.cmp; // copy
bool noruns = isNoRunsLiteral(build, id, info, max_len);
bool noruns = isNoRunsFragment(build, f, max_len);
DEBUG_PRINTF("fragment is %s\n", noruns ? "noruns" : "not noruns");
auto lit_final = lit.s; // copy auto lit_final = lit.s; // copy