From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Mon, 30 May 2016 14:29:08 +0000 (+0200)
Subject: [surf] Fix NetCard leak
X-Git-Tag: v3_14~1098
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ef0f3039d7bc0b6fe8a2be4ece9423c69fe4e21b

[surf] Fix NetCard leak
---

diff --git a/src/surf/AsImpl.cpp b/src/surf/AsImpl.cpp
index 12d2c2f4cd..23b78aa009 100644
--- a/src/surf/AsImpl.cpp
+++ b/src/surf/AsImpl.cpp
@@ -19,7 +19,6 @@ namespace simgrid {
     }
     AsImpl::~AsImpl()
     {
-      delete netcard_;
     }
 
     xbt_dynar_t AsImpl::getOneLinkRoutes() {
diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 65459eee7b..952cf79ed1 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -286,7 +286,9 @@ void surf_init(int *argc, char **argv)
 
   XBT_DEBUG("Add routing levels");
   ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib, NULL);
-  ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib, nullptr);
+  ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib, [](void* p) {
+    delete static_cast<simgrid::surf::NetCard*>(p);
+  });
 
   XBT_DEBUG("Add SURF levels");
   simgrid::surf::HostImpl::classInit();