diff options
author | Florian Westphal <fw@strlen.de> | 2013-07-03 12:52:41 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2013-07-03 22:38:49 +0200 |
commit | 1e4d02009d4517af4ee8ba0fe6d620a61978ac51 (patch) | |
tree | ee402d9caa45a747853ba7552503e4252de4ad9c /src | |
parent | 4795f4c737e59587d05d6eced2c86d3fc50ad42d (diff) |
src: callback: fix memory leak when ct has dynamically allocated attr
Must free ct and exp using the _destroy functions, else we leak attributes with malloc'd data.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src')
-rw-r--r-- | src/callback.c | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/src/callback.c b/src/callback.c index 684d3b2..19cc663 100644 --- a/src/callback.c +++ b/src/callback.c @@ -82,31 +82,13 @@ int __callback(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data) break; } - switch(ret) { - case NFCT_CB_FAILURE: - if (ct) - free(ct); - if (exp) - free(exp); - ret = NFNL_CB_FAILURE; - break; - case NFCT_CB_STOP: - if (ct) - free(ct); - if (exp) - free(exp); - ret = NFNL_CB_STOP; - break; - case NFCT_CB_CONTINUE: - if (ct) - free(ct); - if (exp) - free(exp); - ret = NFNL_CB_CONTINUE; - break; - case NFCT_CB_STOLEN: - ret = NFNL_CB_CONTINUE; - break; - } + if (ret == NFCT_CB_STOLEN) + return NFNL_CB_CONTINUE; + + if (ct) + nfct_destroy(ct); + if (exp) + nfexp_destroy(exp); + return ret; } |