1.1 --- a/sourcehook/sourcehook.cpp Sat Apr 30 19:10:07 2005 +0000
1.2 +++ b/sourcehook/sourcehook.cpp Sun May 01 09:55:51 2005 +0000
1.3 @@ -280,53 +280,54 @@
1.4 reinterpret_cast<char*>(adjustediface) + tmp.vtbl_offs);
1.5 void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.vtbl_idx);
1.6
1.7 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.begin();
1.8 - vfnptr_iter != hookman->vfnptrs.end(); ++vfnptr_iter)
1.9 + HookManagerInfo::VfnPtrListIter vfnptr_iter = std::find(hookman->vfnptrs.begin(), hookman->vfnptrs.end(), cur_vfnptr);
1.10 + if (vfnptr_iter == hookman->vfnptrs.end())
1.11 + return false;
1.12 +
1.13 + for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.14 + iface_iter != vfnptr_iter->ifaces.end();)
1.15 {
1.16 - if (vfnptr_iter->vfnptr == cur_vfnptr)
1.17 + std::list<HookManagerInfo::VfnPtr::Iface::Hook> &hooks =
1.18 + post ? iface_iter->hooks_post : iface_iter->hooks_pre;
1.19 +
1.20 + bool erase;
1.21 + for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = hooks.begin();
1.22 + hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter)
1.23 {
1.24 - for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.25 - iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.26 + erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler);
1.27 + if (erase)
1.28 + hookiter->handler->DeleteThis(); // Make the _plugin_ delete the handler object
1.29 + }
1.30 + if (iface_iter->hooks_post.empty() && iface_iter->hooks_pre.empty())
1.31 + {
1.32 + iface_iter = vfnptr_iter->ifaces.erase(iface_iter);
1.33 + if (vfnptr_iter->ifaces.empty())
1.34 {
1.35 - std::list<HookManagerInfo::VfnPtr::Iface::Hook> &hooks =
1.36 - post ? iface_iter->hooks_post : iface_iter->hooks_pre;
1.37 + // Deactivate the hook
1.38 + *reinterpret_cast<void**>(vfnptr_iter->vfnptr) = vfnptr_iter->orig_entry;
1.39 +
1.40 + hookman->vfnptrs.erase(vfnptr_iter);
1.41
1.42 - bool erase;
1.43 - for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = hooks.begin();
1.44 - hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter)
1.45 - {
1.46 - erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler);
1.47 - if (erase)
1.48 - hookiter->handler->DeleteThis(); // Make the _plugin_ delete the handler object
1.49 - }
1.50 - if (iface_iter->hooks_post.empty() && iface_iter->hooks_pre.empty())
1.51 + // Remove callclass patch
1.52 + for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
1.53 + if (cciter->cc.ptr == adjustediface)
1.54 + RemoveCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx);
1.55 +
1.56 + if (hookman->vfnptrs.empty())
1.57 {
1.58 - vfnptr_iter->ifaces.erase(iface_iter);
1.59 - if (vfnptr_iter->ifaces.empty())
1.60 - {
1.61 - // Deactivate the hook
1.62 - *reinterpret_cast<void**>(vfnptr_iter->vfnptr) = vfnptr_iter->orig_entry;
1.63 -
1.64 - hookman->vfnptrs.erase(vfnptr_iter);
1.65 -
1.66 - // Remove callclass patch
1.67 - for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
1.68 - if (cciter->cc.ptr == adjustediface)
1.69 - RemoveCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx);
1.70 + // Unregister the hook manager
1.71 + hookman->func(HA_Unregister, NULL);
1.72 + }
1.73
1.74 - if (hookman->vfnptrs.empty())
1.75 - {
1.76 - // Unregister the hook manager
1.77 - hookman->func(HA_Unregister, NULL);
1.78 - }
1.79 -
1.80 - }
1.81 - }
1.82 + // Don't try to continue looping through ifaces
1.83 + // - the list is already invalid
1.84 + return true;
1.85 }
1.86 - return true;
1.87 }
1.88 + else
1.89 + ++iface_iter;
1.90 }
1.91 - return false;
1.92 + return true;
1.93 }
1.94
1.95 GenericCallClass *CSourceHookImpl::GetCallClass(void *iface)