Fix stop function of NFCT plugin.

This patch fixes some crashes in NFCT plugin that were triggered
by the call of the destructor_nfct function (during stop).

diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c
index a33ec355d45c8b92e17986b656cf51c9f9b99aa0..a39bf0899e21f952b759bfb7a9173ba84e954f8d 100644 (file)
--- a/input/flow/ulogd_inpflow_NFCT.c
+++ b/input/flow/ulogd_inpflow_NFCT.c
@@ -884,7 +884,7 @@ static int constructor_nfct(struct ulogd_pluginstance *upi)
 
 static int destructor_nfct(struct ulogd_pluginstance *pi)
 {
-       struct nfct_pluginstance *cpi = (void *) pi;
+       struct nfct_pluginstance *cpi = (void *) pi->private;
        int rc;
 
        hashtable_destroy(cpi->ct_active);

diff --git a/src/hash.c b/src/hash.c
index 33541e8e68718bc70f9967b394737e4af1762756..700678c73f77563b0a5b98925c388b569060e3e2 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -75,8 +75,10 @@ hashtable_create(int hashsize, int limit, int datasize,
 
 void hashtable_destroy(struct hashtable *h)
 {
-       hashtable_flush(h);
-       free(h);
+       if (h) {
+               hashtable_flush(h);
+               free(h);
+       }
 }
 
 void *hashtable_add(struct hashtable *table, void *data)