From: Daniel Lenski Date: Mon, 30 Nov 2020 20:35:17 +0000 (-0800) Subject: fix undefined pointer error from !143 X-Git-Tag: v8.20~378^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dc1f764d8cbdfa7b2ac4f1b90e0cdac20b04871d;p=users%2Fdwmw2%2Fopenconnect.git fix undefined pointer error from !143 Caught by static analyzer run. Signed-off-by: Daniel Lenski --- diff --git a/auth-globalprotect.c b/auth-globalprotect.c index 498008fb..06913267 100644 --- a/auth-globalprotect.c +++ b/auth-globalprotect.c @@ -328,6 +328,9 @@ static int parse_login_xml(struct openconnect_info *vpninfo, xmlNode *xml_node, while (xml_node && xml_node->type != XML_ELEMENT_NODE) xml_node = xml_node->next; + /* XX: argument 0 is unknown so we reuse this for extra arguments */ + arg = &gp_login_args[(argn < gp_login_nargs) ? argn : 0]; + if (!xml_node) value = NULL; else if (!xmlnode_get_val(xml_node, "argument", &value)) { @@ -348,9 +351,6 @@ static int parse_login_xml(struct openconnect_info *vpninfo, xmlNode *xml_node, } else goto err_out; - /* XX: argument 0 is unknown so we reuse this for extra arguments */ - arg = &gp_login_args[(argn < gp_login_nargs) ? argn : 0]; - if (arg->unknown && value) { unknown_args++; vpn_progress(vpninfo, PRG_ERR,