X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxbios.c;h=b327632b9be2cbfa363ae98ade3dced6fa43eac6;hp=c362a759ffef1b32b5debe278f7e3ebf7957dfd4;hb=ef1da3dc02d5c3683cca34f1f5c59ca1b2134c72;hpb=01724d23d3e65e6ca12f3800d79c7de6ec241ea2

diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index c362a759..b327632b 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -788,9 +788,19 @@ void psxBios_bcmp() { // 0x29
 
 void psxBios_memcpy() { // 0x2a
 	char *p1 = (char *)Ra0, *p2 = (char *)Ra1;
-	while ((s32)a2-- > 0) *p1++ = *p2++;
-
-	v0 = a0; pc0 = ra;
+	s32 n=0;
+	v0 = a0;
+	if (a0 == 0 || a2 > 0x7FFFFFFF)
+	{
+		pc0 = ra;
+		return;
+	}
+	while ((s32)a2-- > 0) {
+		n++;
+		*p1++ = *p2++;
+	}
+	a2 = 0;
+	pc0 = ra;
 }
 
 void psxBios_memset() { // 0x2b