X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fsio.c;h=7aa669bf5e311473d5e92cf6a821eb68ef5bd8df;hb=cfa5a2aff5202aadca7d19c76b61c80cec5b327c;hp=329bc36ba1730989fa9b7107b1d36a15e13c5ef2;hpb=d014a47167b28b19f87546bca0b0c53f08b1daff;p=pcsx_rearmed.git

diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index 329bc36b..7aa669bf 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -24,6 +24,10 @@
 #include "sio.h"
 #include <sys/stat.h>
 
+#ifdef USE_LIBRETRO_VFS
+#include <streams/file_stream_transforms.h>
+#endif
+
 // Status Flags
 #define TX_RDY		0x0001
 #define RX_RDY		0x0002
@@ -407,6 +411,12 @@ void LoadMcd(int mcd, char *str) {
 	}
 
 	McdDisable[mcd - 1] = 0;
+#ifdef HAVE_LIBRETRO
+	// memcard1 is handled by libretro
+	if (mcd == 1)
+		return;
+#endif
+
 	if (str == NULL || strcmp(str, "none") == 0) {
 		McdDisable[mcd - 1] = 1;
 		return;
@@ -428,7 +438,12 @@ void LoadMcd(int mcd, char *str) {
 				else if(buf.st_size == MCD_SIZE + 3904)
 					fseek(f, 3904, SEEK_SET);
 			}
-			fread(data, 1, MCD_SIZE, f);
+			if (fread(data, 1, MCD_SIZE, f) != MCD_SIZE) {
+#ifndef NDEBUG
+				SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+#endif
+				memset(data, 0x00, MCD_SIZE);
+			}
 			fclose(f);
 		}
 		else
@@ -443,7 +458,12 @@ void LoadMcd(int mcd, char *str) {
 			else if(buf.st_size == MCD_SIZE + 3904)
 				fseek(f, 3904, SEEK_SET);
 		}
-		fread(data, 1, MCD_SIZE, f);
+		if (fread(data, 1, MCD_SIZE, f) != MCD_SIZE) {
+#ifndef NDEBUG
+			SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+#endif
+			memset(data, 0x00, MCD_SIZE);
+		}
 		fclose(f);
 	}
 }
@@ -658,6 +678,7 @@ void ConvertMcd(char *mcd, char *data) {
 			fclose(f);
 		}
 		f = fopen(mcd, "r+");
+		if (f == NULL) return;
 		s = s + 3904;
 		fputc('1', f); s--;
 		fputc('2', f); s--;
@@ -692,6 +713,7 @@ void ConvertMcd(char *mcd, char *data) {
 			fclose(f);
 		}
 		f = fopen(mcd, "r+");
+		if (f == NULL) return;
 		s = s + 64;
 		fputc('V', f); s--;
 		fputc('g', f); s--;