Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-13 12:54:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

DiscIO: Only allow alphanumeric ASCII in game IDs

Browse Source 
We often use game IDs in paths, so we should try to make sure path
traversal is impossible in game IDs. Admittedly, doing any kind of real
attack using the six bytes available in game IDs is unrealistic, but no
game ID should contain non-alphanumeric or non-ASCII characters anyway.

Might also fix https://bugs.dolphin-emu.org/issues/13982 by skipping
converting between encodings for game IDs.
This commit is contained in:
JosJuice
2026-02-23 20:59:46 +01:00
parent 1d74321212
commit 7b372db559
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DiscIO/VolumeDisc.cpp
View File

@@ -50,13 +50,13 @@ std::string VolumeDisc::GetGameID(const Partition& partition) const
const std::string maker_id{GetMakerID()};
memcpy(id + 4, maker_id.c_str(), std::min<std::size_t>(maker_id.size(), 2));
return DecodeString(id);
return FilterGameID(id);
}
if (!Read(0, sizeof(id), reinterpret_cast<u8*>(id), partition))
return std::string();
return DecodeString(id);
return FilterGameID(id);
}
Country VolumeDisc::GetCountry(const Partition& partition) const
@@ -126,9 +126,9 @@ std::string VolumeDisc::GetMakerID(const Partition& partition) const
{
case 'S': // SEGA CORPORATION
case 'H': // Hitmaker co,ltd
return DecodeString("6E");
return "6E";
case 'N': // NAMCO CORPORATION
return DecodeString("82");
return "82";
default:
break;
}
@@ -138,7 +138,7 @@ std::string VolumeDisc::GetMakerID(const Partition& partition) const
if (!Read(0x4, sizeof(maker_id), reinterpret_cast<u8*>(&maker_id), partition))
return std::string();
return DecodeString(maker_id);
return FilterGameID(maker_id);
}
std::optional<u16> VolumeDisc::GetRevision(const Partition& partition) const