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

diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index b327632b..97c79519 100644
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -805,8 +805,19 @@ void psxBios_memcpy() { // 0x2a
 
 void psxBios_memset() { // 0x2b
 	char *p = (char *)Ra0;
+	v0 = a0;
+	if (a2 > 0x7FFFFFFF || a2 == 0)
+	{
+		v0 = 0;
+		pc0 = ra;
+		return;
+	}
+	if (a0 == 0)
+	{
+		pc0 = ra;
+		return;
+	}
 	while ((s32)a2-- > 0) *p++ = (char)a1;
-
 	a2 = 0;
 	v0 = a0; pc0 = ra;
 }