Set vpninfo->progress earlier to avoid segfaults with XML file

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/main.c b/main.c
index 44b4405..df4f3d3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -281,13 +281,6 @@ int main(int argc, char **argv)
        if (!vpninfo->sslkey)
                vpninfo->sslkey = vpninfo->cert;
 
-       if (config_lookup_host(vpninfo, argv[optind]))
-               exit(1);
-
-       if (!vpninfo->hostname)
-               vpninfo->hostname = strdup(argv[optind]);
-       vpninfo->urlpath = strdup("/");
-
        if (use_syslog) {
                openlog("openconnect", LOG_PID, LOG_DAEMON);
                vpninfo->progress = syslog_progress;
@@ -295,6 +288,13 @@ int main(int argc, char **argv)
                vpninfo->progress = write_progress;
        }
 
+       if (config_lookup_host(vpninfo, argv[optind]))
+               exit(1);
+
+       if (!vpninfo->hostname)
+               vpninfo->hostname = strdup(argv[optind]);
+       vpninfo->urlpath = strdup("/");
+
 #ifdef SSL_UI
        set_openssl_ui();
 #endif