summaryrefslogtreecommitdiff
path: root/drivers/windows
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2021-06-07 18:31:50 +0200
committerRémi Verschelde <rverschelde@gmail.com>2021-06-07 18:34:00 +0200
commit01d5c463be103a29662d2123cd37ae2f21b077a6 (patch)
treeaec07e9d23605914d956cdb9b4b08817f0f34e48 /drivers/windows
parent6f8d5cff66416993856bdb01c83b999b84425fb0 (diff)
FileAccess: Don't err in `store_buffer` with buffer of size 0
The error check was added for `FileAccessUnix` but it's not an error when both `p_src` and `p_length` are zero. Added correct error checks to all implementations to prevent the actual erroneous case: `p_src` is nullptr but `p_length > 0` (risk of null pointer indexing). Fixes #33564.
Diffstat (limited to 'drivers/windows')
-rw-r--r--drivers/windows/file_access_windows.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp
index 1f46b44f5e..d6deda7b5d 100644
--- a/drivers/windows/file_access_windows.cpp
+++ b/drivers/windows/file_access_windows.cpp
@@ -294,6 +294,7 @@ void FileAccessWindows::store_8(uint8_t p_dest) {
void FileAccessWindows::store_buffer(const uint8_t *p_src, uint64_t p_length) {
ERR_FAIL_COND(!f);
+ ERR_FAIL_COND(!p_src && p_length > 0);
if (flags == READ_WRITE || flags == WRITE_READ) {
if (prev_op == READ) {
if (last_error != ERR_FILE_EOF) {