[conntrack-tools] filter: fix segfault if the Filter clause is unused

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=705435f574e45348f5613672588b453d6285ef20
commit 705435f574e45348f5613672588b453d6285ef20
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Oct 21 18:50:51 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Oct 21 18:50:51 2008 +0200

    filter: fix segfault if the Filter clause is unused
    
    This patch fixes a segfault when conntrackd -k is invoked for an
    instance of conntrackd with no use of the Filter clause.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  705435f574e45348f5613672588b453d6285ef20 (commit)
      from  5fa52f81764d078d0a719a8902ad00a0d3acd511 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 705435f574e45348f5613672588b453d6285ef20
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue Oct 21 18:50:51 2008 +0200

    filter: fix segfault if the Filter clause is unused
    
    This patch fixes a segfault when conntrackd -k is invoked for an
    instance of conntrackd with no use of the Filter clause.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 src/run.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
This patch fixes a segfault when conntrackd -k is invoked for an
instance of conntrackd with no use of the Filter clause.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/src/run.c b/src/run.c
index b7da18c..34d20b0 100644
--- a/src/run.c
+++ b/src/run.c
@@ -40,7 +40,8 @@ void killer(int foo)
 	nfct_close(STATE(event));
 	nfct_close(STATE(request));
 
-	ct_filter_destroy(STATE(us_filter));
+	if (STATE(us_filter))
+		ct_filter_destroy(STATE(us_filter));
 	local_server_destroy(&STATE(local));
 	STATE(mode)->kill();