Fixing the destruction of objects under process control api.

dyninst · Aug 18, 2017 · 390e323 · 390e323
1 parent b4f0d96
commit 390e323
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/dyninstAPI/src/dynProcess.C b/dyninstAPI/src/dynProcess.C
@@ -285,6 +285,8 @@ PCProcess::~PCProcess() {
     signalHandlerLocations_.clear();
 
     trapMapping.clearTrapMappings();
+
+    if(pcProc_) pcProc_->setData(NULL);
 }
 
 void PCProcess::initSymtabReader()

diff --git a/dyninstAPI/src/pcEventHandler.C b/dyninstAPI/src/pcEventHandler.C
@@ -70,10 +70,11 @@ bool PCEventHandler::handle_internal(EventPtr ev) {
 		return true;
 	}
     PCProcess *evProc = static_cast<PCProcess *>(ev->getProcess()->getData());
+
     if( evProc == NULL ) {
         proccontrol_printf("%s[%d]: ERROR: handle to Dyninst process is invalid\n",
                 FILE__, __LINE__);
-        return false;
+        return true;
     }
 
 

diff --git a/dyninstAPI/src/pcEventMuxer.C b/dyninstAPI/src/pcEventMuxer.C
@@ -457,7 +457,7 @@ Event::const_ptr PCEventMailbox::dequeue(bool block) {
     Event::const_ptr ret = eventQueue.front();
     eventQueue.pop();
     PCProcess *evProc = static_cast<PCProcess *>(ret->getProcess()->getData());
-    procCount[evProc]--;
+    if(evProc) procCount[evProc]--;
     assert(procCount[evProc] >= 0);
     queueCond.unlock();