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

Only initialise stream state history when required.

Browse Source 
This fixes 01org/hyperscan#30.
This commit is contained in:
Matthew Barr 2016-08-26 11:08:29 +10:00
parent c1bc6acdea
commit f05e833e10
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/runtime.c
View File

@ -466,16 +466,19 @@ void maintainHistoryBuffer(const struct RoseEngine *rose, char *state,
} }
static really_inline static really_inline
void init_stream(struct hs_stream *s, const struct RoseEngine *rose) { void init_stream(struct hs_stream *s, const struct RoseEngine *rose,
char init_history) {
char *state = getMultiState(s); char *state = getMultiState(s);
// Make absolutely sure that the 16 bytes leading up to the end of the if (init_history) {
// history buffer are initialised, as we rely on this (regardless of the // Make absolutely sure that the 16 bytes leading up to the end of the
// actual values used) in FDR. // history buffer are initialised, as we rely on this (regardless of the
char *hist_end = state + rose->stateOffsets.history + rose->historyRequired; // actual values used) in FDR.
assert(hist_end - 16 >= (const char *)s); char *hist_end =
unaligned_store_u64a(hist_end - 16, 0xDEADDEADDEADDEADull); state + rose->stateOffsets.history + rose->historyRequired;
unaligned_store_u64a(hist_end - 8, 0xDEADDEADDEADDEADull); assert(hist_end - 16 >= (const char *)s);
memset(hist_end - 16, 0x5a, 16);
}
s->rose = rose; s->rose = rose;
s->offset = 0; s->offset = 0;
@ -518,7 +521,7 @@ hs_error_t hs_open_stream(const hs_database_t *db, UNUSED unsigned flags,
return HS_NOMEM; return HS_NOMEM;
} }
init_stream(s, rose); init_stream(s, rose, 1);
*stream = s; *stream = s;
return HS_SUCCESS; return HS_SUCCESS;
@ -962,7 +965,8 @@ hs_error_t hs_reset_stream(hs_stream_t *id, UNUSED unsigned int flags,
unmarkScratchInUse(scratch); unmarkScratchInUse(scratch);
} }
init_stream(id, id->rose); // history already initialised
init_stream(id, id->rose, 0);
return HS_SUCCESS; return HS_SUCCESS;
} }
@ -1047,7 +1051,7 @@ hs_error_t hs_scan_vector(const hs_database_t *db, const char * const * data,
hs_stream_t *id = (hs_stream_t *)(scratch->bstate); hs_stream_t *id = (hs_stream_t *)(scratch->bstate);
init_stream(id, rose); /* open stream */ init_stream(id, rose, 1); /* open stream */
for (u32 i = 0; i < count; i++) { for (u32 i = 0; i < count; i++) {
DEBUG_PRINTF("block %u/%u offset=%llu len=%u\n", i, count, id->offset, DEBUG_PRINTF("block %u/%u offset=%llu len=%u\n", i, count, id->offset,