From 5be6b677d03fe86873a5987f577db57c8a362ee5 Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 9 Mar 2017 16:51:08 +0100
Subject: [PATCH] plug newly introduced leak

---
 include/simgrid/s4u/NetZone.hpp | 2 +-
 src/s4u/s4u_netzone.cpp         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 4ba3ef2a2e..b3b3c18293 100644
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -80,7 +80,7 @@ private:
 
   bool sealed_ = false; // We cannot add more content when sealed
 
-  std::vector<NetZone*>* children_; // sub-netzones
+  std::vector<NetZone*>* children_ = nullptr; // sub-netzones
 };
 }
 }; // Namespace simgrid::s4u
diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index eda9c3b5c6..6aa572dc07 100644
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -33,9 +33,12 @@ void NetZone::seal()
 
 NetZone::~NetZone()
 {
+  for (auto nz : *children_)
+    delete nz;
   delete children_;
   xbt_free(name_);
 }
+
 std::unordered_map<std::string, std::string>* NetZone::properties()
 {
   return simgrid::simix::kernelImmediate([this] {
-- 
2.20.1