summaryrefslogtreecommitdiffstats
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-05-08 11:43:53 +1200
committerAndrew Bartlett <abartlet@samba.org>2014-07-07 23:32:35 +0200
commitd6486cf0d2bb206dd20b4e5ee2e17f1e770eeea7 (patch)
treeb36a3260967d10397060c3a441ebdafc4e2a4ea2 /source3/param/loadparm.c
parent49b500a61f0e1ed9d02654597c0785e7a1b933e9 (diff)
downloadsamba-d6486cf0d2bb206dd20b4e5ee2e17f1e770eeea7.tar.gz
samba-d6486cf0d2bb206dd20b4e5ee2e17f1e770eeea7.tar.xz
samba-d6486cf0d2bb206dd20b4e5ee2e17f1e770eeea7.zip
param: ensure CMD_LIST is freed when freeing a parameter
As well as correctly deallocating the memory, this prevents a potential bug where s3 globals struct may be freed, but it can be referred to elsewhere. Change-Id: I92fc9baa26aee5b4a35b767bed901928cbb7c74f Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
Diffstat (limited to 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6e64482ee3..c4dd803354 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -487,7 +487,7 @@ static void free_one_parameter_common(void *parm_ptr,
(parm.type == P_USTRING))
{
string_free((char**)parm_ptr);
- } else if (parm.type == P_LIST) {
+ } else if (parm.type == P_LIST || parm.type == P_CMDLIST) {
TALLOC_FREE(*((char***)parm_ptr));
}
}