Merge "[HICN-80] Avoid segfault when deleting memif interface on VPP."

1 files changed, 10 insertions, 9 deletions

diff --git a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc
index 8dc607295..0d622f9a3 100644
--- a/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc
+++ b/libtransport/src/hicn/transport/core/vpp_forwarder_interface.cc
@@ -208,20 +208,21 @@ void VPPForwarderInterface::registerRoute(Prefix &prefix) {
 }
 
 void VPPForwarderInterface::closeConnection() {
-  if (sw_if_index_ != uint32_t(~0) && VPPForwarderInterface::memif_api_) {
-    int ret = memif_binary_api_delete_memif(VPPForwarderInterface::memif_api_,
-                                            sw_if_index_);
+  if (VPPForwarderInterface::api_) {
+    if (sw_if_index_ != uint32_t(~0)) {
+      int ret = memif_binary_api_delete_memif(VPPForwarderInterface::memif_api_,
+                                              sw_if_index_);
 
-    if (ret < 0) {
-      TRANSPORT_LOGE("Error deleting memif with sw idx %u.", sw_if_index_);
+      if (ret < 0) {
+        TRANSPORT_LOGE("Error deleting memif with sw idx %u.", sw_if_index_);
+      }
     }
-  }
 
-  if (VPPForwarderInterface::api_) {
     vpp_binary_api_destroy(VPPForwarderInterface::api_);
-  }
+    connector_.close();
 
-  connector_.close();
+    VPPForwarderInterface::api_ = nullptr;
+  }
 }
 
 }  // namespace core