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

[ox/fs] Fix FileStoreItem::data bounds

Browse Source
This commit is contained in:
Gary Talent 2018-05-02 19:45:45 -05:00
parent a8f185ea57
commit 06013211d4
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
deps/ox/src/ox/fs/filestore/filestoretemplate.hpp vendored
View File

@ -35,8 +35,8 @@ struct __attribute__((packed)) FileStoreItem: public ptrarith::Item<size_t> {
return sizeof(*this) + this->size(); return sizeof(*this) + this->size();
} }
ptrarith::Ptr<uint8_t, size_t> data() { ptrarith::Ptr<uint8_t, std::size_t> data() {
return ptrarith::Ptr<uint8_t, size_t>(this, this->size(), sizeof(*this), this->size() - sizeof(*this)); return ptrarith::Ptr<uint8_t, std::size_t>(this, this->fullSize(), sizeof(*this), this->size());
} }
}; };
@ -74,7 +74,7 @@ class FileStoreTemplate: public FileStore {
Error read(InodeId_t id, FsSize_t readStart, FsSize_t readSize, void *data, FsSize_t *size); Error read(InodeId_t id, FsSize_t readStart, FsSize_t readSize, void *data, FsSize_t *size);
ValErr<const uint8_t*> read(InodeId_t id); const ptrarith::Ptr<uint8_t, std::size_t> read(InodeId_t id);
/** /**
* Reads the "file" at the given id. You are responsible for freeing * Reads the "file" at the given id. You are responsible for freeing
@ -100,6 +100,8 @@ class FileStoreTemplate: public FileStore {
InodeId_t available(); InodeId_t available();
private: private:
void compact();
FileStoreData *fileStoreData(); FileStoreData *fileStoreData();
/** /**
@ -201,14 +203,20 @@ Error FileStoreTemplate<size_t>::write(InodeId_t id, void *data, FsSize_t dataSi
// write the given data // write the given data
auto dest = m_buffer->malloc(dataSize); auto dest = m_buffer->malloc(dataSize);
// if first malloc failed, compact and try again // if first malloc failed, compact and try again
dest = m_buffer->malloc(dataSize); if (!dest.valid()) {
compact();
dest = m_buffer->malloc(dataSize);
}
if (dest.valid()) { if (dest.valid()) {
new (dest) FileStoreItem<size_t>(dataSize); new (dest) FileStoreItem<size_t>(dataSize);
dest->id = id; dest->id = id;
dest->fileType = fileType; dest->fileType = fileType;
auto destData = m_buffer->template dataOf<uint8_t>(dest); auto destData = m_buffer->template dataOf<uint8_t>(dest);
if (destData.valid()) { if (destData.valid()) {
ox_memcpy(destData, data, dest->size()); // write data if any was provided
if (data != nullptr) {
ox_memcpy(destData, data, dest->size());
}
auto fsData = fileStoreData(); auto fsData = fileStoreData();
if (fsData) { if (fsData) {
auto root = m_buffer->ptr(fsData->rootNode); auto root = m_buffer->ptr(fsData->rootNode);
@ -312,8 +320,13 @@ int FileStoreTemplate<size_t>::read(InodeId_t id, FsSize_t readStart,
} }
template<typename size_t> template<typename size_t>
ValErr<const uint8_t*> FileStoreTemplate<size_t>::read(InodeId_t id) { const ptrarith::Ptr<uint8_t, std::size_t> FileStoreTemplate<size_t>::read(InodeId_t id) {
return reinterpret_cast<uint8_t*>(find(id).get()); auto item = find(id);
if (item.valid()) {
return item->data();
} else {
return nullptr;
}
} }
template<typename size_t> template<typename size_t>
@ -345,6 +358,10 @@ InodeId_t FileStoreTemplate<size_t>::available() {
return m_buffer->available(); return m_buffer->available();
} }
template<typename size_t>
void FileStoreTemplate<size_t>::compact() {
}
template<typename size_t> template<typename size_t>
typename FileStoreTemplate<size_t>::FileStoreData *FileStoreTemplate<size_t>::fileStoreData() { typename FileStoreTemplate<size_t>::FileStoreData *FileStoreTemplate<size_t>::fileStoreData() {
auto first = m_buffer->firstItem(); auto first = m_buffer->firstItem();