Fix sceNpBasicSetPresence when data is nullptr and size is 0

RPCS3 · Jan 5, 2024 · 13926c7 · 13926c7
1 parent 2a1af17
commit 13926c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp
@@ -846,7 +846,7 @@ error_code sceNpBasicSetPresence(vm::cptr<u8> data, u32 size)
 	}
 
 	// Not checked by API
-	ensure(data);
+	ensure(data || !size, "Access violation");
 
 	std::vector pr_data(data.get_ptr(), data.get_ptr() + size);
 	nph.set_presence(std::nullopt, pr_data);
@@ -876,7 +876,7 @@ error_code sceNpBasicSetPresenceDetails(vm::cptr<SceNpBasicPresenceDetails> pres
 	}
 
 	// Not checked by API
-	ensure(pres);
+	ensure(pres, "Access violation");
 
 	if (pres->size > SCE_NP_BASIC_MAX_PRESENCE_SIZE)
 	{
@@ -923,7 +923,7 @@ error_code sceNpBasicSetPresenceDetails2(vm::cptr<SceNpBasicPresenceDetails2> pr
 	}
 
 	// Not checked by API
-	ensure(pres);
+	ensure(pres, "Access violation");
 
 	if (pres->size > SCE_NP_BASIC_MAX_PRESENCE_SIZE)
 	{

diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/Emu/NP/np_handler.cpp
@@ -823,8 +823,8 @@ namespace np
 
 		for (auto& [npid, pr_info] : current_presences)
 		{
-			// Only communicates info about online users with presence
-			if (!pr_info.online || pr_info.pr_com_id.data[0] == 0)
+			// Only communicates info about online users
+			if (!pr_info.online)
 			{
 				continue;
 			}