diff options
| author | Luca Deri <deri@ntop.org> | 2019-01-17 00:41:05 +0100 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2019-01-17 00:41:05 +0100 |
| commit | d088a968a97c9c6a70357278c1f7a87567188328 (patch) | |
| tree | 9e25c68d82e07cea234abfe49db820b2d21a3c41 /src/lib/ndpi_main.c | |
| parent | efef99cbadc8ddd6f6743e04d184fe240d6eb334 (diff) | |
| parent | f3b0878a37d252f0a9300eab7a7df28d64146211 (diff) | |
Merge branch 'dev' of https://github.com/ntop/nDPI into dev
Diffstat (limited to 'src/lib/ndpi_main.c')
| -rw-r--r-- | src/lib/ndpi_main.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 594d521d3..23ea29947 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -841,21 +841,21 @@ static int init_hyperscan(struct ndpi_detection_module_struct *ndpi_mod) { } need_to_be_free = (unsigned char*)calloc(sizeof(unsigned char), num_patterns + 1); - if (!need_to_be_free) { + if(!need_to_be_free) { free(expressions); free(ids); return(-1); } - for (i = 0, j = 0; host_match[i].string_to_match != NULL || host_match[i].pattern_to_match != NULL; i++) { - if (host_match[i].pattern_to_match) { + for(i = 0, j = 0; host_match[i].string_to_match != NULL || host_match[i].pattern_to_match != NULL; i++) { + if(host_match[i].pattern_to_match) { expressions[j] = host_match[i].pattern_to_match; ids[j] = host_match[i].protocol_id; need_to_be_free[j] = 0; ++j; } else { expressions[j] = string2hex(host_match[i].string_to_match); - if (expressions[j] != NULL) { + if(expressions[j] != NULL) { ids[j] = host_match[i].protocol_id; need_to_be_free[j] = 1; ++j; @@ -870,11 +870,12 @@ static int init_hyperscan(struct ndpi_detection_module_struct *ndpi_mod) { rc = hyperscan_load_patterns(hs, j, (const char**)expressions, ids); - for (i = 0; i < j; ++i) - if (need_to_be_free[i]) + for(i = 0; i < j; ++i) + if(need_to_be_free[i]) free(expressions[i]); free(expressions), free(ids); + free(need_to_be_free); return(rc); } |