diff options
| -rw-r--r-- | example/ndpiReader.c | 10 | ||||
| -rw-r--r-- | example/ndpiSimpleIntegration.c | 5 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 5 | ||||
| -rw-r--r-- | tests/dga/dga_evaluate.c | 3 | ||||
| -rw-r--r-- | tests/performance/geo.c | 3 | ||||
| -rw-r--r-- | tests/unit/unit.c | 3 |
6 files changed, 17 insertions, 12 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c index 2b3a7cae7..81a6745f5 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -899,7 +899,7 @@ void extcap_config() { if(!ndpi_str) exit(0); - ndpi_finalize_initialization(ndpi_str); + if(ndpi_finalize_initialization(ndpi_str) != 0) exit(0); ndpi_num_supported_protocols = ndpi_get_num_protocols(ndpi_str); proto_defaults = ndpi_get_proto_defaults(ndpi_str); @@ -5252,9 +5252,7 @@ static void dgaUnitTest() { assert(ndpi_str != NULL); - ndpi_finalize_initialization(ndpi_str); - - assert(ndpi_str != NULL); + assert(ndpi_finalize_initialization(ndpi_str) ==0); for(i=0; non_dga[i] != NULL; i++) { if(debug) printf("Checking non DGA %s\n", non_dga[i]); @@ -6659,7 +6657,7 @@ void domainSearchUnitTest() { assert(ndpi_str); assert(sc); - ndpi_finalize_initialization(ndpi_str); + assert(ndpi_finalize_initialization(ndpi_str) == 0); ndpi_domain_classify_add(ndpi_str, sc, NDPI_PROTOCOL_NTOP, ".ntop.org"); ndpi_domain_classify_add(ndpi_str, sc, NDPI_PROTOCOL_NTOP, domain); @@ -6692,7 +6690,7 @@ void domainSearchUnitTest2() { assert(ndpi_str); assert(c); - ndpi_finalize_initialization(ndpi_str); + assert(ndpi_finalize_initialization(ndpi_str) == 0); ndpi_domain_classify_add(ndpi_str, c, class_id, "ntop.org"); ndpi_domain_classify_add(ndpi_str, c, class_id, "apple.com"); diff --git a/example/ndpiSimpleIntegration.c b/example/ndpiSimpleIntegration.c index 13e395e70..f526e1d26 100644 --- a/example/ndpiSimpleIntegration.c +++ b/example/ndpiSimpleIntegration.c @@ -210,7 +210,10 @@ static struct nDPI_workflow * init_workflow(char const * const file_or_device) return NULL; } - ndpi_finalize_initialization(workflow->ndpi_struct); + if(ndpi_finalize_initialization(workflow->ndpi_struct) != 0) { + free_workflow(&workflow); + return NULL; + } return workflow; } diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 8b0c6f612..2e0633c84 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -11157,7 +11157,10 @@ void ndpi_generate_options(u_int opt, FILE *options_out) { ndpi_str = ndpi_init_detection_module(NULL); if (!ndpi_str) return; - ndpi_finalize_initialization(ndpi_str); + if(ndpi_finalize_initialization(ndpi_str) != 0) { + ndpi_exit_detection_module(ndpi_str); + return; + } switch(opt) { case 0: /* List known protocols */ diff --git a/tests/dga/dga_evaluate.c b/tests/dga/dga_evaluate.c index 697d60475..ac50f0a6a 100644 --- a/tests/dga/dga_evaluate.c +++ b/tests/dga/dga_evaluate.c @@ -96,8 +96,7 @@ int main(int argc, char **argv) { assert(ndpi_str != NULL); ndpi_set_config(ndpi_str, NULL, "log.level", "3"); /* NDPI_LOG_DEBUG_EXTRA */ set_ndpi_debug_function(ndpi_str, ndpi_dbg_fn); - ndpi_finalize_initialization(ndpi_str); - assert(ndpi_str != NULL); + assert(ndpi_finalize_initialization(ndpi_str) == 0); while(fgets(buffer, sizeof(buffer), fd) != NULL) { diff --git a/tests/performance/geo.c b/tests/performance/geo.c index 8d83d5fa9..4c7c138fb 100644 --- a/tests/performance/geo.c +++ b/tests/performance/geo.c @@ -10,7 +10,8 @@ int main() if (ndpi_info_mod == NULL) return 1; - ndpi_finalize_initialization(ndpi_info_mod); + if(ndpi_finalize_initialization(ndpi_info_mod) != 0) + return 1; rc = ndpi_load_geoip(ndpi_info_mod, "GeoLite2-City.mmdb", "GeoLite2-ASN.mmdb"); if(rc != 0) { diff --git a/tests/unit/unit.c b/tests/unit/unit.c index 0e098a029..5ebbf36bc 100644 --- a/tests/unit/unit.c +++ b/tests/unit/unit.c @@ -389,7 +389,8 @@ int main(int argc, char **argv) { if (ndpi_info_mod == NULL) return -1; - ndpi_finalize_initialization(ndpi_info_mod); + if(ndpi_finalize_initialization(ndpi_info_mod) != 0) + return -1; /* * If we want argument parsing on Windows, |