Some defensive programming at destruction time, and fix a latent dangling pointer bug.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp
index 2a12b07de..dcfc526ec 100644
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@ -809,6 +809,7 @@ SmtEngine::~SmtEngine() throw() {
 
     for(unsigned i = 0; i < d_dumpCommands.size(); ++i) {
       delete d_dumpCommands[i];
+      d_dumpCommands[i] = NULL;
     }
     d_dumpCommands.clear();
 
@@ -819,15 +820,22 @@ SmtEngine::~SmtEngine() throw() {
     d_definedFunctions->deleteSelf();
 
     delete d_theoryEngine;
+    d_theoryEngine = NULL;
     delete d_propEngine;
+    d_propEngine = NULL;
     delete d_decisionEngine;
+    d_decisionEngine = NULL;
 
     delete d_stats;
+    d_stats = NULL;
     delete d_statisticsRegistry;
+    d_statisticsRegistry = NULL;
 
     delete d_private;
+    d_private = NULL;
 
     delete d_userContext;
+    d_userContext = NULL;
 
   } catch(Exception& e) {
     Warning() << "CVC4 threw an exception during cleanup." << endl