summaryrefslogtreecommitdiff
path: root/src/common/file_util.h
diff options
context:
space:
mode:
authorGravatar Lioncash2020-04-15 14:21:22 -0400
committerGravatar Lioncash2020-04-15 14:43:37 -0400
commite77337588e75adc6e6b8477a8dbe9d1ea8f25c8c (patch)
tree0b6d9732e5276abf734e64dcd708a18da1e931a4 /src/common/file_util.h
parentMerge pull request #3662 from ReinUsesLisp/constant-attrs (diff)
downloadyuzu-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 'src/common/file_util.h')
-rw-r--r--src/common/file_util.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h
index cde7ddf2d..f7a0c33fa 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -222,22 +222,15 @@ public:
222 static_assert(std::is_trivially_copyable_v<T>, 222 static_assert(std::is_trivially_copyable_v<T>,
223 "Given array does not consist of trivially copyable objects"); 223 "Given array does not consist of trivially copyable objects");
224 224
225 if (!IsOpen()) { 225 return ReadImpl(data, length, sizeof(T));
226 return std::numeric_limits<std::size_t>::max();
227 }
228
229 return std::fread(data, sizeof(T), length, m_file);
230 } 226 }
231 227
232 template <typename T> 228 template <typename T>
233 std::size_t WriteArray(const T* data, std::size_t length) { 229 std::size_t WriteArray(const T* data, std::size_t length) {
234 static_assert(std::is_trivially_copyable_v<T>, 230 static_assert(std::is_trivially_copyable_v<T>,
235 "Given array does not consist of trivially copyable objects"); 231 "Given array does not consist of trivially copyable objects");
236 if (!IsOpen()) {
237 return std::numeric_limits<std::size_t>::max();
238 }
239 232
240 return std::fwrite(data, sizeof(T), length, m_file); 233 return WriteImpl(data, length, sizeof(T));
241 } 234 }
242 235
243 template <typename T> 236 template <typename T>
@@ -278,6 +271,9 @@ public:
278 } 271 }
279 272
280private: 273private:
274 std::size_t ReadImpl(void* data, std::size_t length, std::size_t data_size) const;
275 std::size_t WriteImpl(const void* data, std::size_t length, std::size_t data_size);
276
281 std::FILE* m_file = nullptr; 277 std::FILE* m_file = nullptr;
282}; 278};
283 279