Merge pull request #2886 from brauner/2019-03-01/bugfixes

src/lxc/conf.c

@@ -2813,7 +2813,6 @@ static int idmaptool_on_path_and_privileged(const char *binary, cap_value_t cap)
 	__do_free char *path = NULL;
 	int ret;
 	struct stat st;
-	int fret = 0;
 
 	errno = EINVAL;
 	if (cap != CAP_SETUID && cap != CAP_SETGID)

src/lxc/confile.c

@@ -2711,7 +2711,7 @@ int write_config(int fd, const struct lxc_conf *conf)
 bool do_append_unexp_config_line(struct lxc_conf *conf, const char *key,
 				 const char *v)
 {
-	__do_free char *tmp;
+	__do_free char *tmp = NULL;
 	int ret;
 	size_t len;