verify disc is iso9660 before mount, fix over-eager updxell

Author: InvoxiPlayGames

libxenon/drivers/iso9660/iso9660.c

@@ -1112,6 +1112,35 @@ static const devoptab_t dotab_iso9660 =
 	NULL // device data
 };
 
+static int verify_iso9660_disc(const DISC_INTERFACE *di)
+{
+	char sector_data[2048];
+	int is_joliet, i, blk = 0;
+
+	/* Check for joliet extensions */
+	is_joliet = 0;
+	for (i=1; i<=3; i++) {
+		blk = di->readSectors(16, 1, sector_data);
+		if (blk < 0) return blk;
+		if (memcmp(sector_data, "\02CD001", 6) == 0) {
+			is_joliet = isjoliet(sector_data+88);
+			if (is_joliet) break;
+		}
+	}
+
+	/* If that failed, go after standard/RockRidge ISO */
+	if (!is_joliet) {
+		/* Grab and check the volume descriptor */	
+		blk = di->readSectors(16, 1, sector_data);
+		if (blk < 0) return i;
+		if (memcmp(sector_data, "\01CD001", 6) != 0) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
 bool ISO9660_Mount(const char* name, const DISC_INTERFACE *disc_interface)
 {
 	char *nameCopy;
@@ -1126,6 +1155,10 @@ bool ISO9660_Mount(const char* name, const DISC_INTERFACE *disc_interface)
 
 	if (!disc_interface->isInserted())
 		return false;
+	
+	// Verify that it's actually an ISO9660 formatted disc and not another format or not inserted
+	if (verify_iso9660_disc(disc_interface) != 0)
+		return false;
 
 	sprintf(devname, "%s:", name);
 	if (FindDevice(devname) >= 0)

libxenon/drivers/xb360/xb360.c

@@ -7,6 +7,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 #include <pci/io.h>
 #include <time/time.h>
 #include <xenon_nand/xenon_sfcx.h>
@@ -362,6 +363,13 @@ int updateXeLL(char *path)
     FILE *f;
     int i, j, k, status, startblock, current, offsetinblock, blockcnt, filelength;
     unsigned char *updxell, *user, *spare;
+	struct stat s;
+
+  	memset(&s, 0, sizeof(struct stat));
+	stat(path, &s);
+	long size = s.st_size;
+	if (size <= 0)	
+		return -1; //Invalid Filesize
 
     /* Check if updxell.bin is present */
     f = fopen(path, "rb");

libxenon/drivers/xenon_nand/xenon_sfcx.c

@@ -560,6 +560,7 @@ int try_rawflash(char *filename)
 {
 	struct stat s;
 
+  	memset(&s, 0, sizeof(struct stat));
 	stat(filename, &s);
 	long size = s.st_size;
 	if (size <= 0)