diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-16 23:16:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 23:16:36 +0100 |
| commit | bc7e105821cc1a7b1173bc997aa61b3f5b58430a (patch) | |
| tree | 95fbebd9a69d61285ae767c0b51905c9c48dbf5b /core/io/file_access_encrypted.cpp | |
| parent | 97ce8708e86b4cf17b01f7f8ddfd74e348fbb56c (diff) | |
| parent | c28428fe4dcd78886b972afcad6b239a58b4b973 (diff) | |
Merge pull request #47079 from W4RH4WK/allow-nullptr-with-zero-length-get-buffer
Allow nullptr with zero length in FileAccess get_buffer
Diffstat (limited to 'core/io/file_access_encrypted.cpp')
| -rw-r--r-- | core/io/file_access_encrypted.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index 133ec18762..8ace897f18 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -237,7 +237,7 @@ uint8_t FileAccessEncrypted::get_8() const { } int FileAccessEncrypted::get_buffer(uint8_t *p_dst, int p_length) const { - ERR_FAIL_COND_V(!p_dst, -1); + ERR_FAIL_COND_V(!p_dst && p_length > 0, -1); ERR_FAIL_COND_V(p_length < 0, -1); ERR_FAIL_COND_V_MSG(writing, -1, "File has not been opened in read mode."); |