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

Jenkins-1080: fixed error reporting logical combination match in "A&!B" type by

Browse Source 
moving flush_comb behind report_eod_matches in hs_close_stream/hs_reset_stream.
This commit is contained in:
Chang, Harry 2018-08-08 14:44:01 +08:00
parent 8a0e4f8249
commit 62dfd48d53
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/runtime.c
View File

@ -934,12 +934,6 @@ hs_error_t hs_scan_stream_internal(hs_stream_t *id, const char *data,
} }
} }
if (rose->flushCombProgramOffset && !told_to_stop_matching(scratch)) {
if (roseRunFlushCombProgram(rose, scratch, ~0ULL) == MO_HALT_MATCHING) {
scratch->core_info.status |= STATUS_TERMINATED;
}
}
setStreamStatus(state, scratch->core_info.status); setStreamStatus(state, scratch->core_info.status);
if (likely(!can_stop_matching(scratch))) { if (likely(!can_stop_matching(scratch))) {
@ -994,6 +988,13 @@ hs_error_t HS_CDECL hs_close_stream(hs_stream_t *id, hs_scratch_t *scratch,
unmarkScratchInUse(scratch); unmarkScratchInUse(scratch);
} }
if (id->rose->flushCombProgramOffset && !told_to_stop_matching(scratch)) {
if (roseRunFlushCombProgram(id->rose, scratch, ~0ULL)
== MO_HALT_MATCHING) {
scratch->core_info.status |= STATUS_TERMINATED;
}
}
hs_stream_free(id); hs_stream_free(id);
return HS_SUCCESS; return HS_SUCCESS;
@ -1019,6 +1020,13 @@ hs_error_t HS_CDECL hs_reset_stream(hs_stream_t *id, UNUSED unsigned int flags,
unmarkScratchInUse(scratch); unmarkScratchInUse(scratch);
} }
if (id->rose->flushCombProgramOffset && !told_to_stop_matching(scratch)) {
if (roseRunFlushCombProgram(id->rose, scratch, ~0ULL)
== MO_HALT_MATCHING) {
scratch->core_info.status |= STATUS_TERMINATED;
}
}
// history already initialised // history already initialised
init_stream(id, id->rose, 0); init_stream(id, id->rose, 0);