Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14667 from JosJuice/nand-import-path-traversal

Browse Source 
Prevent path traversal in NANDImporter::ProcessEntry
This commit is contained in:
Admiral H. Curtiss authored and GitHub committed 2026-06-04 17:31:33 +02:00
2 parents 07aeb59321 2faa9760d3
commit aabea5b1e3
1 file changed
+3 -6
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DiscIO/NANDImporter.cpp
+3 -6
View File
@@ -11,6 +11,7 @@
#include "Common/IOFile.h" #include "Common/IOFile.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#include "Common/NandPaths.h"
#include "Core/IOS/ES/Formats.h" #include "Core/IOS/ES/Formats.h"
namespace DiscIO namespace DiscIO
@@ -134,11 +135,7 @@ bool NANDImporter::ExtractFiles()
std::string NANDImporter::GetPath(const NANDFSTEntry& entry, const std::string& parent_path) std::string NANDImporter::GetPath(const NANDFSTEntry& entry, const std::string& parent_path)
{ {
std::string name(entry.name, strnlen(entry.name, sizeof(NANDFSTEntry::name))); std::string name(entry.name, strnlen(entry.name, sizeof(NANDFSTEntry::name)));
return parent_path + '/' + Common::EscapeFileName(name);
if (name.front() == '/' || parent_path.back() == '/')
return parent_path + name;
return parent_path + '/' + name;
} }
bool NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path) bool NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path)
@@ -153,7 +150,7 @@ bool NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path
const NANDFSTEntry entry = m_superblock->fst[entry_number]; const NANDFSTEntry entry = m_superblock->fst[entry_number];
const std::string path = GetPath(entry, parent_path); const std::string path = entry_number == 0 ? parent_path : GetPath(entry, parent_path);
INFO_LOG_FMT(DISCIO, "Entry: {} Path: {}", entry, path); INFO_LOG_FMT(DISCIO, "Entry: {} Path: {}", entry, path);
Type type = static_cast<Type>(entry.mode & 3); Type type = static_cast<Type>(entry.mode & 3);