check if parsing of ipsec update was successful

src/starter/confread.c

@@ -931,8 +931,9 @@ confread_load(const char *file)
 	/* load IPSec configuration file  */
 	cfgp = parser_load_conf(file);
 	if (!cfgp)
+	{
 		return NULL;
-
+	}
 	cfg = (starter_config_t *)alloc_thing(starter_config_t, "starter_config_t");
 
 	/* set default values */

src/starter/starter.c

@@ -452,7 +452,7 @@ int main (int argc, char **argv)
 	       );
 	    new_cfg = confread_load(CONFIG_FILE);
 
-	    if (new_cfg->err + new_cfg->non_fatal_err == 0)
+	    if (new_cfg && (new_cfg->err + new_cfg->non_fatal_err == 0))
 	    {
 		/* Switch to new config. New conn will be loaded below */
 		if (!starter_cmp_defaultroute(&new_cfg->defaultroute
@@ -546,7 +546,10 @@ int main (int argc, char **argv)
 	    else
 	    {
 		plog("can't reload config file due to errors -- keeping old one");
-		confread_free(new_cfg);
+		if (new_cfg)
+		{
+		    confread_free(new_cfg);
+		}
 	    }
 	    _action_ &= ~FLAG_ACTION_UPDATE;
 	    last_reload = time(NULL);