aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore/misc.c
diff options
context:
space:
mode:
authornotaz2014-12-21 21:00:34 +0200
committernotaz2014-12-21 21:02:25 +0200
commit9a9bcd781195829a8bc63144d516bc6087bb6b52 (patch)
tree336fb4cb9c6303f501916137600579f62c228e7f /libpcsxcore/misc.c
parent9726a4aff95e362af3df014a02185031911bf784 (diff)
downloadpcsx_rearmed-9a9bcd781195829a8bc63144d516bc6087bb6b52.tar.gz
pcsx_rearmed-9a9bcd781195829a8bc63144d516bc6087bb6b52.tar.bz2
pcsx_rearmed-9a9bcd781195829a8bc63144d516bc6087bb6b52.zip
misc: merge from pcsxr r91261,r91276
Author: edgbla Small fixes. 11834, 11836 (Lioncash);
Diffstat (limited to 'libpcsxcore/misc.c')
-rw-r--r--libpcsxcore/misc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 14f68ec..3ee9876 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -208,9 +208,9 @@ int LoadCdrom() {
// read the SYSTEM.CNF
READTRACK();
- sscanf((char *)buf + 12, "BOOT = cdrom:\\%256s", exename);
+ sscanf((char *)buf + 12, "BOOT = cdrom:\\%255s", exename);
if (GetCdromFile(mdir, time, exename) == -1) {
- sscanf((char *)buf + 12, "BOOT = cdrom:%256s", exename);
+ sscanf((char *)buf + 12, "BOOT = cdrom:%255s", exename);
if (GetCdromFile(mdir, time, exename) == -1) {
char *ptr = strstr((char *)buf + 12, "cdrom:");
if (ptr != NULL) {
@@ -268,7 +268,7 @@ int LoadCdromFile(const char *filename, EXE_HEADER *head) {
u32 size, addr;
void *mem;
- sscanf(filename, "cdrom:\\%256s", exename);
+ sscanf(filename, "cdrom:\\%255s", exename);
time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);
@@ -338,9 +338,9 @@ int CheckCdrom() {
if (GetCdromFile(mdir, time, "SYSTEM.CNF;1") != -1) {
READTRACK();
- sscanf(buf + 12, "BOOT = cdrom:\\%256s", exename);
+ sscanf(buf + 12, "BOOT = cdrom:\\%255s", exename);
if (GetCdromFile(mdir, time, exename) == -1) {
- sscanf(buf + 12, "BOOT = cdrom:%256s", exename);
+ sscanf(buf + 12, "BOOT = cdrom:%255s", exename);
if (GetCdromFile(mdir, time, exename) == -1) {
char *ptr = strstr(buf + 12, "cdrom:"); // possibly the executable is in some subdir
if (ptr != NULL) {