nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix memory corruption in romfs build (closes #708)

Browse source
This commit is contained in:
Michael Scire 2019-12-07 17:42:00 -08:00
parent 7e6ff1f327
commit 889ea5e5aa
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stratosphere/ams_mitm/source/fs_mitm/fsmitm_romfs.cpp
View file

@ -371,8 +371,10 @@ namespace ams::mitm::fs {
/* Set name. */ /* Set name. */
cur_entry->name_size = name_size; cur_entry->name_size = name_size;
if (name_size) { if (name_size) {
std::memset(cur_entry->name + util::AlignDown(name_size, 4), 0, 4);
std::memcpy(cur_entry->name, cur_file->path.get() + cur_file->cur_path_ofs, name_size); std::memcpy(cur_entry->name, cur_file->path.get() + cur_file->cur_path_ofs, name_size);
for (size_t i = name_size; i < util::AlignUp(name_size, 4); i++) {
cur_entry->name[i] = 0;
}
} }
/* Emplace a source. */ /* Emplace a source. */
@ -418,8 +420,10 @@ namespace ams::mitm::fs {
/* Set name. */ /* Set name. */
cur_entry->name_size = name_size; cur_entry->name_size = name_size;
if (name_size) { if (name_size) {
std::memset(cur_entry->name + util::AlignDown(name_size, 4), 0, 4);
std::memcpy(cur_entry->name, cur_dir->path.get() + cur_dir->cur_path_ofs, name_size); std::memcpy(cur_entry->name, cur_dir->path.get() + cur_dir->cur_path_ofs, name_size);
for (size_t i = name_size; i < util::AlignUp(name_size, 4); i++) {
cur_entry->name[i] = 0;
}
} }
} }