From 8228426823ce6f305e2d2eb687aeb78c20109259 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Sun, 11 Jun 2023 13:17:56 +0200
Subject: core,c++: Fixed an error_registry bootstrap infinite recursion bug

---
 src/core/error.cpp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'src/core/error.cpp')

diff --git a/src/core/error.cpp b/src/core/error.cpp
index ef8dc57..9520972 100644
--- a/src/core/error.cpp
+++ b/src/core/error.cpp
@@ -76,14 +76,31 @@ error no_error(){
 }
 
 namespace impl {
+error_registry::error_registry():
+	infos_{
+		{
+			err::no_error::description,
+			err::no_error::is_critical
+		},
+		{
+			err::not_found::description,
+			err::not_found::is_critical
+		},
+		{
+			err::out_of_memory::description,
+			err::out_of_memory::is_critical
+		}
+	}
+{}
+
 error_or<error::code> error_registry::search_id(const std::string_view& desc)const{
 	/**
 	 * Search the index in the vector
 	 */
 	size_t i{};
-	size_t info_max_size = std::min<std::size_t>(infos.size(), std::numeric_limits<error::code>::max());
+	size_t info_max_size = std::min<std::size_t>(infos_.size(), std::numeric_limits<error::code>::max());
 	for(i = 0; i < info_max_size; ++i){
-		if(infos.at(i).description == desc){
+		if(infos_.at(i).description == desc){
 			break;
 		}
 	}
@@ -105,11 +122,11 @@ error_or<error::code> error_registry::search_or_register_id(const std::string_vi
 	auto& err = err_or_id.get_error();
 
 	if(err.is_type<err::not_found>()){
-		size_t new_index = infos.size();
+		size_t new_index = infos_.size();
 		if(new_index == std::numeric_limits<error::code>::max()){
 			return make_error<err::out_of_memory>("Error registry ids are exhausted");
 		}
-		infos.emplace_back(error_info{desc, is_critical});
+		infos_.emplace_back(error_info{desc, is_critical});
 		return static_cast<error::code>(new_index);
 	}
 
-- 
cgit v1.2.3