From 95184aea007c6edbcb44ee876ebaa86f14bf250f Mon Sep 17 00:00:00 2001
From: Dorian Eikenberg <dorian.eikenberg@gdata.de>
Date: Tue, 2 Jan 2024 14:22:35 +0100
Subject: [PATCH] InMemory: Fix build issues

---
 plugins/inmemoryscanner/src/lib/Config.h         |  1 +
 .../inmemoryscanner/test/Scanner_unittest.cpp    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/inmemoryscanner/src/lib/Config.h b/plugins/inmemoryscanner/src/lib/Config.h
index faebec85..6cfc63f7 100644
--- a/plugins/inmemoryscanner/src/lib/Config.h
+++ b/plugins/inmemoryscanner/src/lib/Config.h
@@ -4,6 +4,7 @@
 #include <memory>
 #include <set>
 #include <stdexcept>
+#include <vmicore/plugins/IPluginConfig.h>
 #include <vmicore/plugins/PluginInterface.h>
 
 namespace InMemoryScanner
diff --git a/plugins/inmemoryscanner/test/Scanner_unittest.cpp b/plugins/inmemoryscanner/test/Scanner_unittest.cpp
index 4b4daf6b..5d7e78c5 100644
--- a/plugins/inmemoryscanner/test/Scanner_unittest.cpp
+++ b/plugins/inmemoryscanner/test/Scanner_unittest.cpp
@@ -139,7 +139,7 @@ namespace InMemoryScanner
                 .WillByDefault(
                     [&memoryRegionDescriptor = memoryRegionDescriptor]()
                     {
-                        auto memoryRegions = std::make_unique<std::list<MemoryRegion>>();
+                        auto memoryRegions = std::make_unique<std::vector<MemoryRegion>>();
                         memoryRegions->push_back(std::move(memoryRegionDescriptor));
                         return memoryRegions;
                     });
@@ -147,7 +147,7 @@ namespace InMemoryScanner
                 .WillByDefault(
                     [&memoryRegionDescriptorForSharedMemory = memoryRegionDescriptorForSharedMemory]()
                     {
-                        auto memoryRegions = std::make_unique<std::list<MemoryRegion>>();
+                        auto memoryRegions = std::make_unique<std::vector<MemoryRegion>>();
                         memoryRegions->push_back(std::move(memoryRegionDescriptorForSharedMemory));
                         return memoryRegions;
                     });
@@ -175,7 +175,7 @@ namespace InMemoryScanner
             .WillByDefault(
                 [startAddress = startAddress, maxScanSize = maxScanSize]()
                 {
-                    auto memoryRegions = std::make_unique<std::list<MemoryRegion>>();
+                    auto memoryRegions = std::make_unique<std::vector<MemoryRegion>>();
                     memoryRegions->emplace_back(
                         startAddress, maxScanSize + 1, "", std::make_unique<MockPageProtection>(), false, false, false);
                     return memoryRegions;
@@ -192,7 +192,7 @@ namespace InMemoryScanner
             .WillByDefault(
                 [startAddress = startAddress, size = size]()
                 {
-                    auto memoryRegions = std::make_unique<std::list<MemoryRegion>>();
+                    auto memoryRegions = std::make_unique<std::vector<MemoryRegion>>();
                     memoryRegions->emplace_back(
                         startAddress, size, "", std::make_unique<MockPageProtection>(), false, false, false);
                     return memoryRegions;
@@ -209,7 +209,7 @@ namespace InMemoryScanner
             .WillByDefault(
                 [startAddress = startAddress, size = size]()
                 {
-                    auto memoryRegions = std::make_unique<std::list<MemoryRegion>>();
+                    auto memoryRegions = std::make_unique<std::vector<MemoryRegion>>();
                     memoryRegions->emplace_back(
                         startAddress, size, "", std::make_unique<MockPageProtection>(), false, false, false);
                     return memoryRegions;
@@ -244,7 +244,7 @@ namespace InMemoryScanner
             .WillByDefault(
                 [&memoryRegionDescriptor = memoryRegionDescriptor]()
                 {
-                    auto memoryRegions = std::make_unique<std::list<MemoryRegion>>();
+                    auto memoryRegions = std::make_unique<std::vector<MemoryRegion>>();
                     memoryRegions->push_back(std::move(memoryRegionDescriptor));
                     return memoryRegions;
                 });
@@ -311,7 +311,7 @@ namespace InMemoryScanner
             .WillByDefault(
                 [startAddress = startAddress, size = size]()
                 {
-                    auto memoryRegions = std::make_unique<std::list<MemoryRegion>>();
+                    auto memoryRegions = std::make_unique<std::vector<MemoryRegion>>();
                     memoryRegions->emplace_back(
                         startAddress, size, "", std::make_unique<MockPageProtection>(), false, false, false);
 
@@ -364,7 +364,7 @@ namespace InMemoryScanner
             .WillByDefault(
                 [&memoryRegionDescriptor = memoryRegionDescriptor]()
                 {
-                    auto memoryRegions = std::make_unique<std::list<MemoryRegion>>();
+                    auto memoryRegions = std::make_unique<std::vector<MemoryRegion>>();
                     memoryRegions->push_back(std::move(memoryRegionDescriptor));
 
                     return memoryRegions;