Improve logging about corrupt ISOs

hrydgard · Jul 12, 2023 · a920b61 · a920b61
1 parent 431a055
commit a920b61
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Core/FileSystems/ISOFileSystem.cpp b/Core/FileSystems/ISOFileSystem.cpp
@@ -177,6 +177,14 @@ ISOFileSystem::~ISOFileSystem() {
 	delete treeroot;
 }
 
+std::string ISOFileSystem::TreeEntry::BuildPath() {
+	if (parent) {
+		return parent->BuildPath() + "/" + name;
+	} else {
+		return name;
+	}
+}
+
 void ISOFileSystem::ReadDirectory(TreeEntry *root) {
 	for (u32 secnum = root->startsector, endsector = root->startsector + (root->dirsize + 2047) / 2048; secnum < endsector; ++secnum) {
 		u8 theSector[2048];
@@ -228,12 +236,12 @@ void ISOFileSystem::ReadDirectory(TreeEntry *root) {
 			entry->startsector = dir.firstDataSector;
 			entry->dirsize = dir.dataLength;
 			entry->valid = isFile;  // Can pre-mark as valid if file, as we don't recurse into those.
-			VERBOSE_LOG(FILESYS, "%s: %s %08x %08x %i", entry->isDirectory ? "D" : "F", entry->name.c_str(), (u32)dir.firstDataSector, entry->startingPosition, entry->startingPosition);
+			VERBOSE_LOG(FILESYS, "%s: %s %08x %08x %d", entry->isDirectory ? "D" : "F", entry->name.c_str(), (u32)dir.firstDataSector, entry->startingPosition, entry->startingPosition);
 
 			// Round down to avoid any false reports.
 			if (isFile && dir.firstDataSector + (dir.dataLength / 2048) > blockDevice->GetNumBlocks()) {
 				blockDevice->NotifyReadError();
-				ERROR_LOG(FILESYS, "File '%s' starts or ends outside ISO", entry->name.c_str());
+				ERROR_LOG(FILESYS, "File '%s' starts or ends outside ISO. firstDataSector: %d len: %d", entry->BuildPath().c_str(), dir.firstDataSector, dir.dataLength);
 			}
 
 			if (entry->isDirectory && !relative) {

diff --git a/Core/FileSystems/ISOFileSystem.h b/Core/FileSystems/ISOFileSystem.h
@@ -60,6 +60,9 @@ class ISOFileSystem : public IFileSystem {
 	struct TreeEntry {
 		~TreeEntry();
 
+		// Recursive function that reconstructs the path by looking at the parent pointers.
+		std::string BuildPath();
+
 		std::string name;
 		u32 flags = 0;
 		u32 startingPosition = 0;