epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

sharedpv: defend against dying objects in SharedPV::close()

Browse Source 
Likely when destroy=true
This commit is contained in:
Michael Davidsaver
2018-09-17 12:01:52 -07:00
parent 5f03fafba7
commit 52e0bd09f8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/sharedstate_pv.cpp
View File

@@ -246,10 +246,14 @@ void SharedPV::close(bool destroy)
}
FOR_EACH(monitors_t::const_iterator, it, end, monitors) {
(*it)->close();
p_monitor.push_back((*it)->shared_from_this());
try {
p_monitor.push_back((*it)->shared_from_this());
}catch(std::tr1::bad_weak_ptr&) { /* ignore, racing dtor */ }
}
FOR_EACH(channels_t::const_iterator, it, end, channels) {
p_channel.push_back((*it)->shared_from_this());
try {
p_channel.push_back((*it)->shared_from_this());
}catch(std::tr1::bad_weak_ptr&) { /* ignore, racing dtor */ }
}
type.reset();