From 9726a4aff95e362af3df014a02185031911bf784 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 21 Dec 2014 20:43:23 +0200
Subject: cdriso: merge from pcsxr r90558

Author: edgbla
cdriso: cbn/cbin detection fix;
---
 libpcsxcore/cdriso.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libpcsxcore/cdriso.c')

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index d6672f9..2c9e692 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -795,6 +795,8 @@ static int handlepbp(const char *isofile) {
 	if (ext == NULL || (strcmp(ext, ".pbp") != 0 && strcmp(ext, ".PBP") != 0))
 		return -1;
 
+	fseek(cdHandle, 0, SEEK_SET);
+
 	numtracks = 0;
 
 	ret = fread(&pbp_hdr, 1, sizeof(pbp_hdr), cdHandle);
@@ -958,6 +960,8 @@ static int handlecbin(const char *isofile) {
 	if (ext == NULL || (strcasecmp(ext + 1, ".cbn") != 0 && strcasecmp(ext, ".cbin") != 0))
 		return -1;
 
+	fseek(cdHandle, 0, SEEK_SET);
+
 	ret = fread(&ciso_hdr, 1, sizeof(ciso_hdr), cdHandle);
 	if (ret != sizeof(ciso_hdr)) {
 		SysPrintf("failed to read ciso header\n");
-- 
cgit v1.2.3


From 9a9bcd781195829a8bc63144d516bc6087bb6b52 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 21 Dec 2014 21:00:34 +0200
Subject: misc: merge from pcsxr r91261,r91276

Author: edgbla
Small fixes. 11834, 11836 (Lioncash);
---
 libpcsxcore/cdriso.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libpcsxcore/cdriso.c')

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 2c9e692..b733f5b 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -552,9 +552,9 @@ static int parsecue(const char *isofile) {
 			pregapOffset = -1; // mark to fill track start_offset
 		}
 		else if (!strcmp(token, "FILE")) {
-			t = sscanf(linebuf, " FILE \"%256[^\"]\"", tmpb);
+			t = sscanf(linebuf, " FILE \"%255[^\"]\"", tmpb);
 			if (t != 1)
-				sscanf(linebuf, " FILE %256s", tmpb);
+				sscanf(linebuf, " FILE %255s", tmpb);
 
 			// absolute path?
 			ti[numtracks + 1].handle = fopen(tmpb, "rb");
-- 
cgit v1.2.3