diff --git a/common.c b/common.c
index d3c66a2..8c85b2f 100644
--- a/common.c
+++ b/common.c
@@ -422,7 +422,7 @@ str_ensure_space (struct str *self, size_t n)
 }
 
 static void
-str_append_data (struct str *self, const char *data, size_t n)
+str_append_data (struct str *self, const void *data, size_t n)
 {
 	str_ensure_space (self, n);
 	memcpy (self->str + self->len, data, n);
@@ -1866,6 +1866,7 @@ read_config_file (struct str_map *config, struct error **e)
 	{
 		error_set (e, "could not open `%s' for reading: %s",
 			filename, strerror (errno));
+		free (filename);
 		return false;
 	}
 
@@ -1902,6 +1903,7 @@ read_config_file (struct str_map *config, struct error **e)
 
 	str_free (&line);
 	fclose (fp);
+	free (filename);
 	return !errors;
 }