diff options
| author | Alexander Gavrilov | 2012-08-26 22:43:18 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-08-26 22:43:18 +0400 |
| commit | b2bdc199cb6aec64034e672f7590aa2a7a27194c (patch) | |
| tree | 825af130e3c0bb313e3699099836e3acfafe7626 /library | |
| parent | 84f6663a078ee8907fb1287fc25672c5f226f420 (diff) | |
| download | dfhack-b2bdc199cb6aec64034e672f7590aa2a7a27194c.tar.gz dfhack-b2bdc199cb6aec64034e672f7590aa2a7a27194c.tar.bz2 dfhack-b2bdc199cb6aec64034e672f7590aa2a7a27194c.tar.xz | |
Fix NULL pointer access in ~virtual_identity.
Diffstat (limited to 'library')
| -rw-r--r-- | library/DataDefs.cpp | 6 | ||||
| -rw-r--r-- | library/VTableInterpose.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp index 4428a2f7..34116444 100644 --- a/library/DataDefs.cpp +++ b/library/DataDefs.cpp @@ -218,8 +218,10 @@ virtual_identity::virtual_identity(size_t size, TAllocateFn alloc, virtual_identity::~virtual_identity() { // Remove interpose entries, so that they don't try accessing this object later - while (!interpose_list.empty()) - interpose_list.begin()->second->on_host_delete(this); + for (auto it = interpose_list.begin(); it != interpose_list.end(); ++it) + if (it->second) + it->second->on_host_delete(this); + interpose_list.clear(); } /* Vtable name to identity lookup. */ diff --git a/library/VTableInterpose.cpp b/library/VTableInterpose.cpp index 47110cec..04c436ba 100644 --- a/library/VTableInterpose.cpp +++ b/library/VTableInterpose.cpp @@ -311,7 +311,7 @@ void VMethodInterposeLinkBase::on_host_delete(virtual_identity *from) // Unlink the chains child_hosts.erase(from); - from->interpose_list.erase(vmethod_idx); + from->interpose_list[vmethod_idx] = NULL; } } |
