fix: removal of active_count variable and manual size management

Author: kernelwernel

src/vmaware.hpp

@@ -4511,12 +4511,9 @@ struct VM {
             brand_list_t active_brands = {};
             active_brands.reserve(MAX_BRANDS);
 
-            size_t active_count = 0;
-
             for (size_t i = 0; i < MAX_BRANDS; ++i) {
                 if (core::brand_scoreboard.at(i).score > 0) {
                     active_brands.push_back(std::make_pair(core::brand_scoreboard.at(i).name, core::brand_scoreboard.at(i).score));
-                    active_count++;
                 }
             }
 
@@ -4527,17 +4524,16 @@ struct VM {
             #endif
 
             auto remove = [&](const enum brand_enum brand) noexcept {
-                for (const auto b : active_brands) {
-                    if (b.first == brand) {
-                        active_brands.at(static_cast<u8>(brand)) = std::make_pair(brand_enum::NULL_BRAND, 0);
-                        active_count--;
+                for (u8 i = 0; i < active_brands.size(); i++) {
+                    if (brand == active_brands.at(i).first) {
+                        active_brands.erase(active_brands.begin() + i);
                         return;
                     }
                 }
             };
 
             // if all brands have a point of 0, return "Unknown"
-            if (active_count == 0) {                        
+            if (active_brands.size() == 0) {                        
                 active_brands.push_back({brand_enum::NULL_BRAND, 1});
                 memo::brand_list::store(active_brands);
                 return active_brands;
@@ -4547,7 +4543,7 @@ struct VM {
             // We skip this early return if the single brand is HYPERV_ARTIFACT,
             // but we must also nullify the result if the score is above 0, 
             // which would most likely indicate a hardened VM instead and return "Unknown".
-            if (active_count == 1) {
+            if (active_brands.size() == 1) {
                 const enum brand_enum brand = active_brands.front().first;
 
                 if (brand == brand_enum::HYPERV_ROOT && score > 0) {
@@ -4560,7 +4556,7 @@ struct VM {
             }
 
             // remove Hyper-V artifacts and Unknown if found with other brands
-            if (active_count > 1) {
+            if (active_brands.size() > 1) {
                 remove(brand_enum::HYPERV_ROOT);
                 remove(brand_enum::NULL_BRAND);
                 remove(brand_enum::INVALID);
@@ -4583,8 +4579,7 @@ struct VM {
                 if (a_hit && b_hit) {
                     remove(a);
                     remove(b);
-                    active_brands.at(static_cast<u8>(result)) = std::make_pair(result, 2);
-                    active_count++;
+                    active_brands.push_back({result, 2});
                 }
             };
 
@@ -4598,8 +4593,7 @@ struct VM {
                     remove(a);
                     remove(b);
                     remove(c);
-                    active_brands.at(static_cast<u8>(result)) = std::make_pair(result, 2);
-                    active_count++;
+                    active_brands.push_back({result, 2});
                 }
             };
 
@@ -4639,8 +4633,8 @@ struct VM {
             merge(brand_enum::VMWARE_HARD, brand_enum::VMWARE_WORKSTATION, brand_enum::VMWARE_HARD);
 
 
-            if (active_count > 1) {
-                std::sort(active_brands.begin(), active_brands.begin() + static_cast<std::ptrdiff_t>(active_count), [](
+            if (active_brands.size() > 1) {
+                std::sort(active_brands.begin(), active_brands.begin() + static_cast<std::ptrdiff_t>(active_brands.size()), [](
                     const brand_element_t& a,
                     const brand_element_t& b
                 ) {