diff -r 90c97c7ae9af -r 24e9ac80de6e sourcehook/sourcehook.cpp --- a/sourcehook/sourcehook.cpp Mon Oct 08 17:22:57 2007 +0000 +++ b/sourcehook/sourcehook.cpp Mon Oct 08 17:23:23 2007 +0000 @@ -698,20 +698,23 @@ CHookManagerContainer::iterator cont_iter = container.find(CHookManager::Descriptor(plug, pubFunc)); - for (List::iterator vfnptr_iter = cont_iter->GetVfnPtrList().begin(); - vfnptr_iter != cont_iter->GetVfnPtrList().end(); ++vfnptr_iter) + if (cont_iter != container.end()) { - for (List::iterator iface_iter = vfnptr_iter->GetIfaceList().begin(); - iface_iter != vfnptr_iter->GetIfaceList().end(); ++iface_iter) + for (List::iterator vfnptr_iter = cont_iter->GetVfnPtrList().begin(); + vfnptr_iter != cont_iter->GetVfnPtrList().end(); ++vfnptr_iter) { - List::iterator hook_iter; - for (hook_iter = iface_iter->GetPreHookList().begin(); - hook_iter != iface_iter->GetPreHookList().end(); ++hook_iter) - removehooks.push_back(hook_iter->GetID()); - - for (hook_iter = iface_iter->GetPostHookList().begin(); - hook_iter != iface_iter->GetPostHookList().end(); ++hook_iter) - removehooks.push_back(hook_iter->GetID()); + for (List::iterator iface_iter = vfnptr_iter->GetIfaceList().begin(); + iface_iter != vfnptr_iter->GetIfaceList().end(); ++iface_iter) + { + List::iterator hook_iter; + for (hook_iter = iface_iter->GetPreHookList().begin(); + hook_iter != iface_iter->GetPreHookList().end(); ++hook_iter) + removehooks.push_back(hook_iter->GetID()); + + for (hook_iter = iface_iter->GetPostHookList().begin(); + hook_iter != iface_iter->GetPostHookList().end(); ++hook_iter) + removehooks.push_back(hook_iter->GetID()); + } } }