[5577] Another case of out-of-bound access

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lib/hooks/callout_manager.cc b/src/lib/hooks/callout_manager.cc
index 55d4a5fd66..9e93439465 100644
--- a/src/lib/hooks/callout_manager.cc
+++ b/src/lib/hooks/callout_manager.cc
@@ -242,6 +242,11 @@ CalloutManager::deregisterCallout(const std::string& name, CalloutPtr callout) {
     // process).
     int hook_index = server_hooks_.getIndex(name);
 
+    // New hooks can have been registered since the manager was constructed.
+    if (hook_index >= hook_vector_.size()) {
+        return (false);
+    }
+
     /// Construct a CalloutEntry matching the current library and the callout
     /// we want to remove.
     CalloutEntry target(current_library_, callout);
@@ -285,6 +290,11 @@ CalloutManager::deregisterAllCallouts(const std::string& name) {
     // process).
     int hook_index = server_hooks_.getIndex(name);
 
+    // New hooks can have been registered since the manager was constructed.
+    if (hook_index >= hook_vector_.size()) {
+        return (false);
+    }
+
     /// Construct a CalloutEntry matching the current library (the callout
     /// pointer is NULL as we are not checking that).
     CalloutEntry target(current_library_, static_cast<CalloutPtr>(0));