From: Arvin Schnell <aschnell@suse.de>
Date: Mon, 23 Jul 2018 19:07:56 +0000 (+0200)
Subject: - set pointers to 0 after delete to have reliable errors
X-Git-Tag: v0.5.6^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4434ecb84eea12f553b495e6004a44b93fdd3303;p=thirdparty%2Fsnapper.git

- set pointers to 0 after delete to have reliable errors
---

diff --git a/server/Client.cc b/server/Client.cc
index d62a2d4c..dc7c69c4 100644
--- 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 7ee1b4b6..dba3401d 100644
--- 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 849b6f63..912e6ff7 100644
--- 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 9159e11f..855f8245 100644
--- 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;
     }