From 7b372db5593ddc92dd442e57170f13072b43ade8 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 23 Feb 2026 20:59:46 +0100 Subject: DiscIO: Only allow alphanumeric ASCII in game IDs 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. --- Source/Core/DiscIO/VolumeDisc.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Core/DiscIO/VolumeDisc.cpp') diff --git a/Source/Core/DiscIO/VolumeDisc.cpp b/Source/Core/DiscIO/VolumeDisc.cpp index ecbb4a9dc9..2ec71b9fe1 100644 --- a/Source/Core/DiscIO/VolumeDisc.cpp +++ b/Source/Core/DiscIO/VolumeDisc.cpp @@ -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(maker_id.size(), 2)); - return DecodeString(id); + return FilterGameID(id); } if (!Read(0, sizeof(id), reinterpret_cast(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(&maker_id), partition)) return std::string(); - return DecodeString(maker_id); + return FilterGameID(maker_id); } std::optional VolumeDisc::GetRevision(const Partition& partition) const -- cgit v1.2.3