From 76ab155840b995c1f535627df6d7e7cb41966bb6 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 16 Nov 2011 15:09:51 +0100 Subject: [PATCH] network: connman_network_set_nameservers() handle NULL argument correctly Trying to access an array pointer which points to NULL is generally a bad idea. Instead just return early. --- src/network.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/network.c b/src/network.c index 058495d..1bb1a6e 100644 --- a/src/network.c +++ b/src/network.c @@ -1392,7 +1392,7 @@ int connman_network_set_nameservers(struct connman_network *network, const char *nameservers) { struct connman_service *service; - char **nameservers_array = NULL; + char **nameservers_array; int i; DBG("network %p nameservers %s", network, nameservers); @@ -1403,8 +1403,10 @@ int connman_network_set_nameservers(struct connman_network *network, __connman_service_nameserver_clear(service); - if (nameservers != NULL) - nameservers_array = g_strsplit(nameservers, " ", 0); + if (nameservers == NULL) + return 0; + + nameservers_array = g_strsplit(nameservers, " ", 0); for (i = 0; nameservers_array[i] != NULL; i++) { __connman_service_nameserver_append(service, -- 2.7.4