- set pointers to 0 after delete to have reliable errors

diff --git a/server/Client.cc b/server/Client.cc
index d62a2d4c2f58ae6556dd11df3e492b7b290c25aa..dc7c69c4a9b936e6e87d32c29caabf8773d35872 100644 (file)
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -113,6 +113,7 @@ Client::delete_comparison(list<Comparison*>::iterator it)
     }
 
     delete *it;
+    *it = nullptr;
 }
 
 

diff --git a/server/MetaSnapper.cc b/server/MetaSnapper.cc
index 7ee1b4b660f80fed1d575c8f3dc74c4de84a771c..dba3401d3b798aa22bd79f8df0952021bbcc04b2 100644 (file)
--- a/server/MetaSnapper.cc
+++ b/server/MetaSnapper.cc
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) [2012-2015] Novell, Inc.
+ * Copyright (c) 2018 SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -103,6 +104,7 @@ MetaSnapper::MetaSnapper(ConfigInfo& config_info)
 MetaSnapper::~MetaSnapper()
 {
     delete snapper;
+    snapper = nullptr;
 }
 
 
@@ -172,7 +174,7 @@ void
 MetaSnapper::unload()
 {
     delete snapper;
-    snapper = NULL;
+    snapper = nullptr;
 }
 
 

diff --git a/snapper/Log.cc b/snapper/Log.cc
index 849b6f632ac4faaab7d2b7109f1898605a90c504..912e6ff71652df97e672e1f5a439394d2d0b43b4 100644 (file)
--- a/snapper/Log.cc
+++ b/snapper/Log.cc
@@ -64,6 +64,7 @@ namespace snapper
     {
        callLogDo(level, *component, file, line, func, stream->str());
        delete stream;
+       stream = nullptr;
     }
 
 }

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index 9159e11fefb230f05494e74189aa0adcc9f2f2f0..855f82458fc6dd1d2a37c5119ad846eadafd2bc1 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) [2011-2015] Novell, Inc.
- * Copyright (c) 2016 SUSE LLC
+ * Copyright (c) [2016,2018] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -147,7 +147,10 @@ namespace snapper
        }
 
        delete filesystem;
+       filesystem = nullptr;
+
        delete config_info;
+       config_info = nullptr;
     }