Merge branch 'master' into curler

Author: Megamouse

rpcs3/Emu/Cell/lv2/sys_prx.cpp

@@ -324,7 +324,7 @@ std::function<void(void*)> lv2_prx::load(utils::serial& ar)
 	const u32 state{ar};
 
 	usz seg_count = 0;
-	ar.deserialize_vle(seg_count);
+	ar.deserialize_vle<9>(seg_count);
 
 	shared_ptr<lv2_prx> prx;
 

rpcs3/Emu/NP/clans_client.cpp

@@ -30,7 +30,6 @@
 
 LOG_CHANNEL(clan_log, "clans");
 
-
 const char* REQ_TYPE_FUNC = "func";
 const char* REQ_TYPE_SEC = "sec";
 
@@ -128,6 +127,11 @@ void fmt_class_string<clan::ClanRequestAction>::format(std::string& out, u64 arg
 
 namespace clan
 {
+	constexpr size_t base64_size(size_t size)
+	{
+		return (size + 2) / 3 * 4 + 1;
+	}
+
 	size_t clans_client::curl_write_callback(void* data, size_t size, size_t nmemb, void* clientp)
 	{
 		const size_t realsize = size * nmemb;
@@ -341,11 +345,16 @@ namespace clan
 			return "";
 		}
 
-		std::vector<byte> ticket_bytes(1024);
-		uint32_t ticket_size = UINT32_MAX;
+		std::vector<byte> ticket_bytes(base64_size(clan_ticket.size()));
+		uint32_t encoded_ticket_size = ::size32(ticket_bytes);
+
+		if (Base64_Encode_NoNl(clan_ticket.data(), ::size32(clan_ticket), ticket_bytes.data(), &encoded_ticket_size) != 0)
+		{
+			clan_log.error("Failed to encode clan ticket to base64");
+			return "";
+		}
 
-		Base64_Encode_NoNl(clan_ticket.data(), static_cast<u32>(clan_ticket.size()), ticket_bytes.data(), &ticket_size);
-		const std::string ticket_str = std::string(reinterpret_cast<char*>(ticket_bytes.data()), ticket_size);
+		const std::string ticket_str = std::string(reinterpret_cast<char*>(ticket_bytes.data()), encoded_ticket_size);
 
 		return ticket_str;
 	}
@@ -923,11 +932,14 @@ namespace clan
 
 		pugi::xml_node status = clan.append_child("bin-attr1"sv);
 
+		const u32 bin_data_size = static_cast<u32>(info.binData1Size);
+		if (bin_data_size > sizeof(info.binAttr1))
+			return SCE_NP_CLANS_ERROR_INVALID_ARGUMENT;
+
 		byte bin_attr_1[SCE_NP_CLANS_MEMBER_BINARY_ATTRIBUTE1_MAX_SIZE * 2 + 1] = {0};
-		uint32_t bin_attr_1_size = UINT32_MAX;
-		Base64_Encode_NoNl(info.binAttr1, info.binData1Size, bin_attr_1, &bin_attr_1_size);
+		uint32_t bin_attr_1_size = sizeof(bin_attr_1);
 
-		if (bin_attr_1_size == UINT32_MAX)
+		if (Base64_Encode_NoNl(info.binAttr1, bin_data_size, bin_attr_1, &bin_attr_1_size) != 0)
 			return SCE_NP_CLANS_ERROR_INVALID_ARGUMENT;
 
 		// `reinterpret_cast` used to let the compiler select the correct overload of `set`

rpcs3/util/serialization.hpp

@@ -206,12 +206,12 @@ namespace utils
 			return true;
 		}
 
-		template <typename T> requires Integral<T>
+		template <uint MaxBits = 0, typename T> requires Integral<T> && (MaxBits <= sizeof(T) * 8)
 		bool deserialize_vle(T& value)
 		{
 			using unsigned_type = std::make_unsigned_t<T>;
 			unsigned_type result{};
-			constexpr u32 bit_width = sizeof(T) * 8;
+			constexpr u32 bit_width = MaxBits ? sizeof(T) * 8 : MaxBits;
 			value = {};
 
 			for (u32 i = 0;; i += 7)
@@ -306,7 +306,7 @@ namespace utils
 			}
 
 			usz size = 0;
-			if (!deserialize_vle(size))
+			if (!deserialize_vle<28>(size))
 			{
 				return false;
 			}
@@ -423,7 +423,7 @@ namespace utils
 			}
 
 			usz size = 0;
-			if (!deserialize_vle(size))
+			if (!deserialize_vle<28>(size))
 			{
 				return false;
 			}