From 9b387485b50755f878cd35b3c8466cf1f19b7d17 Mon Sep 17 00:00:00 2001
From: RipleyTom <RipleyTom@users.noreply.github.com>
Date: Fri, 9 Feb 2024 12:45:27 +0100
Subject: [PATCH] Avoid modifying any memory on SYS_NET_EINTR cases

---
 rpcs3/Emu/Cell/lv2/sys_net.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp
index 01ab791d42..722ee446b9 100644
--- a/rpcs3/Emu/Cell/lv2/sys_net.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp
@@ -1424,13 +1424,13 @@ error_code sys_net_bnet_poll(ppu_thread& ppu, vm::ptr<sys_net_pollfd> fds, s32 n
 		}
 	}
 
-	std::memcpy(fds.get_ptr(), fds_buf.data(), nfds * sizeof(fds[0]));
-
 	if (!has_timedout && !signaled)
 	{
 		return -SYS_NET_EINTR;
 	}
 
+	std::memcpy(fds.get_ptr(), fds_buf.data(), nfds * sizeof(fds[0]));
+
 	return not_an_error(signaled);
 }
 
@@ -1664,6 +1664,11 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 		}
 	}
 
+	if (!has_timedout && !signaled)
+	{
+		return -SYS_NET_EINTR;
+	}
+
 	if (readfds)
 		*readfds = rread;
 	if (writefds)
@@ -1671,11 +1676,6 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 	if (exceptfds)
 		*exceptfds = rexcept;
 
-	if (!has_timedout && !signaled)
-	{
-		return -SYS_NET_EINTR;
-	}
-
 	return not_an_error(signaled);
 }