diff options
| author | 2020-04-15 14:21:22 -0400 | |
|---|---|---|
| committer | 2020-04-15 14:43:37 -0400 | |
| commit | e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c (patch) | |
| tree | 0b6d9732e5276abf734e64dcd708a18da1e931a4 /src/common/file_util.cpp | |
| parent | Merge pull request #3662 from ReinUsesLisp/constant-attrs (diff) | |
| download | yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.tar.gz yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.tar.xz yuzu-e77337588e75adc6e6b8477a8dbe9d1ea8f25c8c.zip | |
file_util: Early-exit in WriteArray and ReadArray if specified lengths are zero
It's undefined behavior to pass a null pointer to std::fread and
std::fwrite, even if the length passed in is zero, so we must perform
the precondition checking ourselves.
A common case where this can occur is when passing in the data of an
empty std::vector and size, as an empty vector will typically have a
null internal buffer.
While we're at it, we can move the implementation out of line and add
debug checks against passing in nullptr to std::fread and std::fwrite.
Diffstat (limited to '')
| -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 35eee0096..7f613891b 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp | |||
| @@ -967,6 +967,34 @@ bool IOFile::Flush() { | |||
| 967 | return IsOpen() && 0 == std::fflush(m_file); | 967 | return IsOpen() && 0 == std::fflush(m_file); |
| 968 | } | 968 | } |
| 969 | 969 | ||
| 970 | std::size_t IOFile::ReadImpl(void* data, std::size_t length, std::size_t data_size) const { | ||
| 971 | if (!IsOpen()) { | ||
| 972 | return std::numeric_limits<std::size_t>::max(); | ||
| 973 | } | ||
| 974 | |||
| 975 | if (length == 0) { | ||
| 976 | return 0; | ||
| 977 | } | ||
| 978 | |||
| 979 | DEBUG_ASSERT(data != nullptr); | ||
| 980 | |||
| 981 | return std::fread(data, data_size, length, m_file); | ||
| 982 | } | ||
| 983 | |||
| 984 | std::size_t IOFile::WriteImpl(const void* data, std::size_t length, std::size_t data_size) { | ||
| 985 | if (!IsOpen()) { | ||
| 986 | return std::numeric_limits<std::size_t>::max(); | ||
| 987 | } | ||
| 988 | |||
| 989 | if (length == 0) { | ||
| 990 | return 0; | ||
| 991 | } | ||
| 992 | |||
| 993 | DEBUG_ASSERT(data != nullptr); | ||
| 994 | |||
| 995 | return std::fwrite(data, data_size, length, m_file); | ||
| 996 | } | ||
| 997 | |||
| 970 | bool IOFile::Resize(u64 size) { | 998 | bool IOFile::Resize(u64 size) { |
| 971 | return IsOpen() && 0 == | 999 | return IsOpen() && 0 == |
| 972 | #ifdef _WIN32 | 1000 | #ifdef _WIN32 |