X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fppf.c;h=edebdd03768638be3d2fe15a3f179347349d87cb;hp=ee32d8bb9114ee3702e7a3b3158d893a659799d3;hb=eed148b7fcde73477379388da58d12cd379a6a81;hpb=ab948f7e6d437dddd070000f36489d7e983eb4ad

diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c
index ee32d8bb..edebdd03 100644
--- a/libpcsxcore/ppf.c
+++ b/libpcsxcore/ppf.c
@@ -190,6 +190,8 @@ void BuildPPFCache() {
 
 	FreePPFCache();
 
+	if (CdromId[0] == '\0') return;
+
 	// Generate filename in the format of SLUS_123.45
 	buffer[0] = toupper(CdromId[0]);
 	buffer[1] = toupper(CdromId[1]);
@@ -337,7 +339,7 @@ unsigned char *sbi_sectors;
 int LoadSBI(const char *fname, int sector_count) {
 	char buffer[16];
 	FILE *sbihandle;
-	u8 sbitime[3];
+	u8 sbitime[3], t;
 	int s;
 
 	sbihandle = fopen(fname, "rb");
@@ -345,14 +347,29 @@ int LoadSBI(const char *fname, int sector_count) {
 		return -1;
 
 	sbi_sectors = calloc(1, sector_count / 8);
-	if (sbi_sectors == NULL)
+	if (sbi_sectors == NULL) {
+		fclose(sbihandle);
 		return -1;
+	}
 
 	// 4-byte SBI header
 	fread(buffer, 1, 4, sbihandle);
-	while (!feof(sbihandle)) {
-		fread(sbitime, 1, 3, sbihandle);
-		fread(buffer, 1, 11, sbihandle);
+	while (1) {
+		s = fread(sbitime, 1, 3, sbihandle);
+		if (s != 3)
+			break;
+		fread(&t, 1, 1, sbihandle);
+		switch (t) {
+		default:
+		case 1:
+			s = 10;
+			break;
+		case 2:
+		case 3:
+			s = 3;
+			break;
+		}
+		fseek(sbihandle, s, SEEK_CUR);
 
 		s = MSF2SECT(btoi(sbitime[0]), btoi(sbitime[1]), btoi(sbitime[2]));
 		if (s < sector_count)