drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/fs] Fix Directory allocating too much space

Browse Source
This commit is contained in:
Gary Talent 2019-11-07 00:34:07 -06:00
parent d033335350
commit ddb158e433
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/ox/src/ox/fs/filesystem/directory.hpp vendored
View File

@ -25,7 +25,7 @@ struct __attribute__((packed)) DirectoryEntry {
char name[MaxFileNameLength]; char name[MaxFileNameLength];
static constexpr std::size_t spaceNeeded(std::size_t chars) { static constexpr std::size_t spaceNeeded(std::size_t chars) {
return offsetof(DirectoryEntryData, name) + chars + 1; return offsetof(DirectoryEntryData, name) + chars;
} }
}; };
@ -234,9 +234,9 @@ ox::Error Directory<FileStore, InodeId_t>::write(PathIterator path, InodeId_t in
return OxError(1); return OxError(1);
} }
const auto entryDataSize = DirectoryEntry<InodeId_t>::DirectoryEntryData::spaceNeeded(name->len() + 1); const auto pathSize = name->len() + 1;
const auto entrySize = DirectoryEntry<InodeId_t>::spaceNeeded(entryDataSize); const auto entryDataSize = DirectoryEntry<InodeId_t>::DirectoryEntryData::spaceNeeded(pathSize);
const auto newSize = old.size() + Buffer::spaceNeeded(m_size + entrySize); const auto newSize = oldStat.value.size + Buffer::spaceNeeded(entryDataSize);
auto cpy = ox_malloca(newSize, Buffer, *old, oldStat.value.size); auto cpy = ox_malloca(newSize, Buffer, *old, oldStat.value.size);
if (cpy == nullptr) { if (cpy == nullptr) {
oxTrace("ox::fs::Directory::write::fail") << "Could not allocate memory for copy of Directory"; oxTrace("ox::fs::Directory::write::fail") << "Could not allocate memory for copy of Directory";
@ -253,7 +253,7 @@ ox::Error Directory<FileStore, InodeId_t>::write(PathIterator path, InodeId_t in
oxTrace("ox::fs::Directory::write") << "Attempting to write Directory entry:" << name->data(); oxTrace("ox::fs::Directory::write") << "Attempting to write Directory entry:" << name->data();
oxTrace("ox::fs::Directory::write") << "Attempting to write Directory to FileStore"; oxTrace("ox::fs::Directory::write") << "Attempting to write Directory to FileStore";
oxReturnError(val->init(inode, name->data(), entrySize)); oxReturnError(val->init(inode, name->data(), val.size()));
return m_fs.write(m_inodeId, cpy, cpy->size()); return m_fs.write(m_inodeId, cpy, cpy->size());
} }
} }