Project

General

Profile

Download (2.81 KB)

Bug #8 » 0001-Bug-fix-for-fast_pattern-bug-8.patch

Anoop Saldanha, 11/13/2009 04:26 AM

View differences:

src/detect-engine-mpm.c
/** \brief Setup the content portion of the sig group head */
static int PatternMatchPreprarePopulateMpm(DetectEngineCtx *de_ctx, SigGroupHead *sgh) {
uint32_t sig;
int fast_pattern = 0;
uint32_t *fast_pattern = NULL;
fast_pattern = (uint32_t *)malloc(sgh->sig_cnt * sizeof(uint32_t));
if (fast_pattern == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
return -1;
}
memset(fast_pattern, 0, sgh->sig_cnt * sizeof(uint32_t));
HashTable *ht = HashTableInit(4096, ContentHashFunc, ContentHashCompareFunc, ContentHashFree);
if (ht == NULL)
......
continue;
if (co->flags & DETECT_CONTENT_FAST_PATTERN) {
fast_pattern = 1;
fast_pattern[sig] = 1;
ContentHash *ch = ContentHashAlloc(co);
if (ch == NULL)
......
}
}
if (fast_pattern == 1) {
if (fast_pattern[sig] == 1) {
if (cnt == 1) {
ContentHash *ch = ContentHashAlloc(s->match->ctx);
ch->nosearch = 1;
ch->use = 1;
}
break;
continue;
}
for (sm = s->match; sm != NULL; sm = sm->next) {
......
if (co == NULL)
continue;
if (fast_pattern == 1) {
if (fast_pattern[sig] == 1) {
if (!(co->flags & DETECT_CONTENT_FAST_PATTERN))
continue;
} else if (co->content_len < sgh->mpm_content_maxlen) {
......
}
}
}
if (fast_pattern != NULL)
free(fast_pattern);
HashTableFree(ht);
return 0;
error:
if (fast_pattern != NULL)
free(fast_pattern);
if (ht != NULL)
HashTableFree(ht);
return -1;
(2-2/2)