sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

param: Add null checks for upcoming str_list_make changes

Browse Source 
In changing str_list_make to str_list_make_v3, the list can be NULL.
These are some additional checks to try to avoid any problems.

Where lists are dealt with, they typically check both if the list is
empty or the list is NULL.

Change-Id: I9012c31dbd9832ce877728bcb3346616ba64c4c5
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>
This commit is contained in:
Garming Sam
2014-03-14 09:30:52 +13:00
committed by Andrew Bartlett
parent 72651f92f0
commit cafd60732b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util/util_runcmd.c
View File

@ -80,6 +80,10 @@ struct tevent_req *samba_runcmd_send(TALLOC_CTX *mem_ctx,
char **argv;
va_list ap;
if (argv0 == NULL) {
return NULL;
}
req = tevent_req_create(mem_ctx, &state,
struct samba_runcmd_state);
if (req == NULL) {

4
lib/util/util_strlist.c
View File

@ -330,7 +330,7 @@ _PUBLIC_ bool str_list_check(const char **list, const char *s)
{
int i;
for (i=0;list[i];i++) {
for (i=0; list != NULL && list[i] != NULL; i++) {
if (strcmp(list[i], s) == 0) return true;
}
return false;
@ -343,7 +343,7 @@ _PUBLIC_ bool str_list_check_ci(const char **list, const char *s)
{
int i;
for (i=0;list[i];i++) {
for (i=0; list != NULL && list[i] != NULL; i++) {
if (strcasecmp(list[i], s) == 0) return true;
}
return false;