diff options
Diffstat (limited to 'core/os')
| -rw-r--r-- | core/os/file_access.cpp | 2 | ||||
| -rw-r--r-- | core/os/pool_allocator.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index 5a3df88619..ad234c2d49 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -368,6 +368,8 @@ Vector<String> FileAccess::get_csv_line(const String &p_delim) const { } int FileAccess::get_buffer(uint8_t *p_dst, int p_length) const { + ERR_FAIL_COND_V(!p_dst && p_length > 0, -1); + ERR_FAIL_COND_V(p_length < 0, -1); int i = 0; for (i = 0; i < p_length && !eof_reached(); i++) { p_dst[i] = get_8(); diff --git a/core/os/pool_allocator.cpp b/core/os/pool_allocator.cpp index b538ca0c96..9be3a62e2f 100644 --- a/core/os/pool_allocator.cpp +++ b/core/os/pool_allocator.cpp @@ -136,7 +136,7 @@ void PoolAllocator::compact_up(int p_from) { for (int i = entry_count - 1; i >= p_from; i--) { Entry &entry = entry_array[entry_indices[i]]; - /* determine hole size to nextious entry */ + /* determine hole size for next entry */ int hole_size = next_entry_end_pos - (entry.pos + aligned(entry.len)); |