From 2d8001aa623d80bdd46ee0c6aaac118ba6a01487 Mon Sep 17 00:00:00 2001 From: Adam Cammack Date: Tue, 11 Apr 2017 23:20:52 -0500 Subject: [PATCH] Sum the results of the module loaders Fixes #8229 --- lib/msf/core/module_manager/loading.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/msf/core/module_manager/loading.rb b/lib/msf/core/module_manager/loading.rb index b08829dbf9..4968937ae4 100644 --- a/lib/msf/core/module_manager/loading.rb +++ b/lib/msf/core/module_manager/loading.rb @@ -116,7 +116,9 @@ module Msf::ModuleManager::Loading loaders.each do |loader| if loader.loadable?(path) - count_by_type = loader.load_modules(path, options) + count_by_type.merge!(loader.load_modules(path, options)) do |key, old, new| + old + new + end end end