Merge pull request #6148 from leoetlino/null-bug

NANDImporter: Construct strings correctly
dolphin-emu · Oct 29, 2017 · 91dac03 · 91dac03
2 parents d6ac8ce + 7aa0833
commit 91dac03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/Source/Core/DiscIO/NANDImporter.cpp b/Source/Core/DiscIO/NANDImporter.cpp
@@ -122,10 +122,7 @@ void NANDImporter::FindSuperblock()
 
 std::string NANDImporter::GetPath(const NANDFSTEntry& entry, const std::string& parent_path)
 {
-  std::string name(reinterpret_cast<const char*>(&entry.name), sizeof(NANDFSTEntry::name));
-  // Get rid of any extra null characters
-  while (name.back() == '\0')
-    name.pop_back();
+  std::string name(entry.name, strnlen(entry.name, sizeof(NANDFSTEntry::name)));
 
   if (name.front() == '/' || parent_path.back() == '/')
     return parent_path + name;

diff --git a/Source/Core/DiscIO/NANDImporter.h b/Source/Core/DiscIO/NANDImporter.h
@@ -29,7 +29,7 @@ class NANDImporter final
 #pragma pack(push, 1)
   struct NANDFSTEntry
   {
-    u8 name[12];
+    char name[12];
     u8 mode;   // 0x0C
     u8 attr;   // 0x0D
     u16 sub;   // 0x0E