diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-03-13 13:27:24 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-07-07 23:32:35 +0200 |
| commit | 72651f92f0d35c026978e765cd9f8e0867c44af3 (patch) | |
| tree | db9b4ad805f50928de3d6b5abee16898a71e0904 /source3/param/loadparm.c | |
| parent | e9a2694e2b50e8be195ae7b22efd5ad9dc7b47e7 (diff) | |
| download | samba-72651f92f0d35c026978e765cd9f8e0867c44af3.tar.gz samba-72651f92f0d35c026978e765cd9f8e0867c44af3.tar.xz samba-72651f92f0d35c026978e765cd9f8e0867c44af3.zip | |
param: pre-emptively correct use of str_list_make_v3 in lib/param
lib/param uses str_list_make, while, s3 uses str_list_make_v3. These
differ slightly and should be made the same.
Notably it returns NULL when given a null or empty string
Also, includes the null check in s3 code to be consistent for merging
this section of code later on.
Change-Id: Ib543a5a5307e06989621ea16bfe87e315d66a7ef
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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0b6a2a4124..e1f52fdfe5 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -2688,6 +2688,10 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue { char **new_list = str_list_make_v3(mem_ctx, pszParmValue, NULL); + if (new_list == NULL) { + break; + } + for (i=0; new_list[i]; i++) { if (*(const char ***)parm_ptr != NULL && new_list[i][0] == '+' && |