enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

protect against null deref when setting proxy vars in connman module 

CID 1382957, 1382958
This commit is contained in:
Mike Blumenkrantz 2018-01-08 10:45:46 -05:00
parent 8d8c9f69e0
commit 4d0e4b1f8f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/connman/e_connman.c
View File

@ -236,7 +236,7 @@ static void _service_parse_prop_changed(struct Connman_Service *cs,
if (strcmp(method, "manual") == 0) 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", DBG("New {all,http{,s}}_proxy: %s",
(const char*)eina_array_data_get(proxy_servers, 0)); (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("http_proxy", eina_array_data_get(proxy_servers, 0));
e_env_set("HTTPS_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_Strbuf *buf;
Eina_Array_Iterator it; Eina_Array_Iterator it;