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

Fix delete/new[] mismatch

Browse Source
This commit is contained in:
Gary Talent 2017-07-01 01:31:09 -05:00
parent 54f929a883
commit ca7a1624b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/fs/filesystem.hpp vendored
View File

@ -693,7 +693,7 @@ int FileSystemTemplate<FileStore, FS_TYPE>::insertDirectoryEntry(const char *dir
auto entry = (DirectoryEntry<typename FileStore::InodeId_t>*) &dirBuff[s.size]; auto entry = (DirectoryEntry<typename FileStore::InodeId_t>*) &dirBuff[s.size];
entry->inode = inode; entry->inode = inode;
entry->setName(fileName); entry->setName(fileName);
return write(s.inode, dirBuff, dirBuffSize, FileType::FileType_Directory); return write(s.inode, dirBuff, dirBuffSize, FileType_Directory);
} else { } else {
return 1; return 1;
} }
@ -803,7 +803,7 @@ void FileSystemTemplate<FileStore, FS_TYPE>::expand(uint64_t newSize) {
if (newSize > size()) { if (newSize > size()) {
auto newBuff = new uint8_t[newSize]; auto newBuff = new uint8_t[newSize];
ox_memcpy(newBuff, m_store, m_store->size()); ox_memcpy(newBuff, m_store, m_store->size());
delete m_store; delete[] m_store;
m_store = (FileStore*) newBuff; m_store = (FileStore*) newBuff;
resize(newSize); resize(newSize);
} }