Safe delete pointers in ClassFinalize

Double free seen on Ubuntu
ornladios · Mar 7, 2019 · d1d7176 · d1d7176
1 parent ae68c4a
commit d1d7176
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/thirdparty/KWSys/adios2sys/SystemTools.cxx b/thirdparty/KWSys/adios2sys/SystemTools.cxx
@@ -4668,13 +4668,20 @@ void SystemTools::ClassInitialize()
 
 void SystemTools::ClassFinalize()
 {
-  delete SystemTools::TranslationMap;
+  auto lf_Delete = [](void*& pointer) {
+    if (pointer != nullptr) {
+      delete pointer;
+      pointer = nullptr;
+    }
+  };
+
+  lf_Delete(SystemTools::TranslationMap);
 #ifdef _WIN32
-  delete SystemTools::PathCaseMap;
-  delete SystemTools::EnvMap;
+  lf_Delete(SystemTools::PathCaseMap);
+  lf_Delete(SystemTools::EnvMap);
 #endif
 #ifdef __CYGWIN__
-  delete SystemTools::Cyg2Win32Map;
+  lf_Delete(SystemTools::Cyg2Win32Map);
 #endif
 }