Cherrypick master patches up to 20th of July 2018. LP: #1781427

1 files changed, 2 insertions, 1 deletions

diff --git a/config.c b/config.c
index 48e02788..e14eae0c 100644
--- a/config.c
+++ b/config.c
@@ -181,9 +181,10 @@ struct mddev_dev *load_containers(void)
 			}
 			d->next = rv;
 			rv = d;
+			map_free(map);
+			map = NULL;
 		}
 	free_mdstat(mdstat);
-	map_free(map);
 
 	return rv;
 }