From 7dcc295e6be68de4816f85e8bdd606d10ee83fd8 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 8 Jan 2018 10:45:46 -0500 Subject: [PATCH] protect against null deref when setting proxy vars in connman module CID 1382957, 1382958 --- src/modules/connman/e_connman.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/connman/e_connman.c b/src/modules/connman/e_connman.c index 220c705b9..9c37c157a 100644 --- a/src/modules/connman/e_connman.c +++ b/src/modules/connman/e_connman.c @@ -236,7 +236,7 @@ static void _service_parse_prop_changed(struct Connman_Service *cs, if (strcmp(method, "manual") == 0) { - if (eina_array_count(proxy_servers) > 0) + if (proxy_servers && (eina_array_count(proxy_servers) > 0)) { DBG("New {all,http{,s}}_proxy: %s", (const char*)eina_array_data_get(proxy_servers, 0)); @@ -244,7 +244,7 @@ static void _service_parse_prop_changed(struct Connman_Service *cs, e_env_set("http_proxy", eina_array_data_get(proxy_servers, 0)); e_env_set("HTTPS_PROXY", eina_array_data_get(proxy_servers, 0)); } - if (eina_array_count(proxy_excludes) > 0) + if (proxy_excludes && (eina_array_count(proxy_excludes) > 0)) { Eina_Strbuf *buf; Eina_Array_Iterator it;