diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-04-17 17:02:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 17:02:35 -0400 |
| commit | 775ecc7d055ff0fe0b9cfad7485581b64a1d8762 (patch) | |
| tree | 0dc512381d80077409a02f0b10e43f22586e9466 /src/common/file_util.cpp | |
| parent | b8f5c71f2d7f819821acf036175cce65ab1ae12c (diff) | |
| parent | e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c (diff) | |
Merge pull request #3672 from lioncash/null
file_util: Early-exit in WriteArray and ReadArray if specified lengths are zero
Diffstat (limited to 'src/common/file_util.cpp')
| -rw-r--r-- | src/common/file_util.cpp | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 35eee0096c..7f613891b3 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -967,6 +967,34 @@ bool IOFile::Flush() { return IsOpen() && 0 == std::fflush(m_file); } +std::size_t IOFile::ReadImpl(void* data, std::size_t length, std::size_t data_size) const { + if (!IsOpen()) { + return std::numeric_limits<std::size_t>::max(); + } + + if (length == 0) { + return 0; + } + + DEBUG_ASSERT(data != nullptr); + + return std::fread(data, data_size, length, m_file); +} + +std::size_t IOFile::WriteImpl(const void* data, std::size_t length, std::size_t data_size) { + if (!IsOpen()) { + return std::numeric_limits<std::size_t>::max(); + } + + if (length == 0) { + return 0; + } + + DEBUG_ASSERT(data != nullptr); + + return std::fwrite(data, data_size, length, m_file); +} + bool IOFile::Resize(u64 size) { return IsOpen() && 0 == #ifdef _WIN32 |