make sure the object is valid when retrieved from inner address

Author: IS4Code

plugins/src/natives/str.cpp

@@ -122,39 +122,39 @@ namespace Natives
 	// native AmxString:str_addr(StringTag:str);
 	AMX_DEFINE_NATIVE_TAG(str_addr, 1, cell)
 	{
-		decltype(strings::pool)::ref_container *str;
+		std::shared_ptr<decltype(strings::pool)::ref_container> str;
 		if(!strings::pool.get_by_id(params[1], str) && str != nullptr) amx_LogicError(errors::pointer_invalid, "string", params[1]);
 		if(str == nullptr)
 		{
 			return strings::pool.get_null_address(amx);
 		}
-		strings::pool.set_cache(*str);
+		strings::pool.set_cache(str);
 		return strings::pool.get_relative_address(amx, *str);
 	}
 
 	// native ConstAmxString:str_addr_const(ConstStringTag:str);
 	AMX_DEFINE_NATIVE_TAG(str_addr_const, 1, cell)
 	{
-		decltype(strings::pool)::ref_container *str;
+		std::shared_ptr<decltype(strings::pool)::ref_container> str;
 		if(!strings::pool.get_by_id(params[1], str) && str != nullptr) amx_LogicError(errors::pointer_invalid, "string", params[1]);
 		if(str == nullptr)
 		{
 			return strings::pool.get_null_address(amx);
 		}
-		strings::pool.set_cache(*str);
+		strings::pool.set_cache(str);
 		return strings::pool.get_relative_address(amx, *str);
 	}
 
 	// native AmxStringBuffer:str_buf_addr(StringTag:str);
 	AMX_DEFINE_NATIVE_TAG(str_buf_addr, 1, cell)
 	{
-		decltype(strings::pool)::ref_container *str;
+		std::shared_ptr<decltype(strings::pool)::ref_container> str;
 		if(!strings::pool.get_by_id(params[1], str)) amx_LogicError(errors::pointer_invalid, "string", params[1]);
 		if(str == nullptr)
 		{
 			amx_LogicError(errors::operation_not_supported, "string");
 		}
-		strings::pool.set_cache(*str);
+		strings::pool.set_cache(str);
 		return strings::pool.get_relative_address(amx, *str);
 	}
 

plugins/src/natives/variant.cpp

@@ -78,7 +78,7 @@ namespace Natives
 	// native AmxVariant:var_addr(VariantTag:str);
 	AMX_DEFINE_NATIVE_TAG(var_addr, 1, cell)
 	{
-		decltype(variants::pool)::ref_container *var;
+		std::shared_ptr<decltype(variants::pool)::ref_container> var;
 		if(!variants::pool.get_by_id(params[1], var) && var != nullptr) amx_LogicError(errors::pointer_invalid, "variant", params[1]);
 		if(var == nullptr)
 		{
@@ -88,33 +88,33 @@ namespace Natives
 		{
 			amx_LogicError(errors::operation_not_supported, "variant");
 		}
-		variants::pool.set_cache(*var);
+		variants::pool.set_cache(var);
 		return variants::pool.get_relative_address(amx, *var);
 	}
 
 	// native ConstAmxVariant:var_addr_const(ConstVariantTag:str);
 	AMX_DEFINE_NATIVE_TAG(var_addr_const, 1, cell)
 	{
-		decltype(variants::pool)::ref_container *var;
+		std::shared_ptr<decltype(variants::pool)::ref_container> var;
 		if(!variants::pool.get_by_id(params[1], var) && var != nullptr) amx_LogicError(errors::pointer_invalid, "variant", params[1]);
 		if(var == nullptr)
 		{
 			return variants::pool.get_null_address(amx);
 		}
-		variants::pool.set_cache(*var);
+		variants::pool.set_cache(var);
 		return variants::pool.get_relative_address(amx, *var);
 	}
 
 	// native AmxVariantBuffer:var_buf_addr(VariantTag:str);
 	AMX_DEFINE_NATIVE_TAG(var_buf_addr, 1, cell)
 	{
-		decltype(variants::pool)::ref_container *var;
+		std::shared_ptr<decltype(variants::pool)::ref_container> var;
 		if(!variants::pool.get_by_id(params[1], var)) amx_LogicError(errors::pointer_invalid, "variant", params[1]);
 		if(var == nullptr || (*var)->is_cell())
 		{
 			amx_LogicError(errors::operation_not_supported, "variant");
 		}
-		variants::pool.set_cache(*var);
+		variants::pool.set_cache(var);
 		return variants::pool.get_relative_address(amx, *var);
 	}
 

plugins/src/objects/object_pool.h

@@ -226,7 +226,7 @@ class object_pool
 private:
 	list_type global_object_list;
 	list_type local_object_list;
-	std::unordered_map<const_inner_ptr, ref_container*> inner_cache;
+	std::unordered_map<const_inner_ptr, std::weak_ptr<ref_container>> inner_cache;
 
 public:
 	object_ptr add()
@@ -325,18 +325,21 @@ class object_pool
 		return false;
 	}
 
-	void set_cache(object_ptr obj)
+	void set_cache(const std::shared_ptr<ref_container> &obj)
 	{
-		inner_cache[&obj->operator[](0)] = &obj;
+		inner_cache[&(*obj)->operator[](0)] = obj;
 	}
 
 	bool find_cache(const_inner_ptr ptr, ref_container *&obj) const
 	{
 		auto it = inner_cache.find(ptr);
 		if(it != inner_cache.end())
 		{
-			obj = it->second;
-			return true;
+			if(auto lock = it->second.lock())
+			{
+				obj = lock.get();
+				return true;
+			}
 		}
 		return false;
 	}