archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fs::memory_stream fixed

Browse source 
seek() allows any offset
read() cannot overflow
This commit is contained in:
Nekotekina 2017-02-11 19:27:49 +03:00
parent 9e39c8cd64
commit be5f780977
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Utilities/File.cpp
View file

@ -933,36 +933,42 @@ fs::file::file(const void* ptr, std::size_t size)
fs::stat_t stat() override fs::stat_t stat() override
{ {
fmt::throw_exception<std::logic_error>("Not supported" HERE); fmt::raw_error("fs::file::memory_stream::stat(): not supported");
} }
bool trunc(u64 length) override bool trunc(u64 length) override
{ {
fmt::throw_exception<std::logic_error>("Not allowed" HERE); return false;
} }
u64 read(void* buffer, u64 count) override u64 read(void* buffer, u64 count) override
{ {
const u64 start = m_pos; if (m_pos < m_size)
const u64 end = seek(count, fs::seek_cur); {
if (end < start) fmt::throw_exception<std::logic_error>("Stream overflow" HERE); // Get readable size
const u64 read_size = end - start; if (const u64 result = std::min<u64>(count, m_size - m_pos))
std::memcpy(buffer, m_ptr + start, read_size); {
return read_size; std::memcpy(buffer, m_ptr + m_pos, result);
m_pos += result;
return result;
}
}
return 0;
} }
u64 write(const void* buffer, u64 count) override u64 write(const void* buffer, u64 count) override
{ {
fmt::throw_exception<std::logic_error>("Not allowed" HERE); return 0;
} }
u64 seek(s64 offset, fs::seek_mode whence) override u64 seek(s64 offset, fs::seek_mode whence) override
{ {
return return
whence == fs::seek_set ? m_pos = std::min<u64>(offset, m_size) : whence == fs::seek_set ? m_pos = offset :
whence == fs::seek_cur ? m_pos = std::min<u64>(offset + m_pos, m_size) : whence == fs::seek_cur ? m_pos = offset + m_pos :
whence == fs::seek_end ? m_pos = std::min<u64>(offset + m_size, m_size) : whence == fs::seek_end ? m_pos = offset + m_size :
(fmt::throw_exception("Invalid whence (0x%x)" HERE, whence), 0); (fmt::raw_error("fs::file::memory_stream::seek(): invalid whence"), 0);
} }
u64 size() override u64 size() override