Zylann/godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added missing position checks to RegionFile

Browse Source
This commit is contained in:
Marc Gilleron 2022-02-28 22:15:59 +00:00
parent 420ad98366
commit 0fd25ce52a
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
streams/region/region_file.cpp
View File

@ -302,10 +302,20 @@ const RegionFormat &RegionFile::get_format() const {
return _header.format; return _header.format;
} }
bool RegionFile::is_valid_block_position(const Vector3 position) const {
return position.x >= 0 && //
position.y >= 0 && //
position.z >= 0 && //
position.x < _header.format.region_size.x && //
position.y < _header.format.region_size.y && //
position.z < _header.format.region_size.z;
}
Error RegionFile::load_block(Vector3i position, VoxelBufferInternal &out_block) { Error RegionFile::load_block(Vector3i position, VoxelBufferInternal &out_block) {
ERR_FAIL_COND_V(_file_access == nullptr, ERR_FILE_CANT_READ); ERR_FAIL_COND_V(_file_access == nullptr, ERR_FILE_CANT_READ);
FileAccess *f = _file_access; FileAccess *f = _file_access;
ERR_FAIL_COND_V(!is_valid_block_position(position), ERR_INVALID_PARAMETER);
const unsigned int lut_index = get_block_index_in_header(position); const unsigned int lut_index = get_block_index_in_header(position);
ERR_FAIL_COND_V(lut_index >= _header.blocks.size(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(lut_index >= _header.blocks.size(), ERR_INVALID_PARAMETER);
const RegionBlockInfo &block_info = _header.blocks[lut_index]; const RegionBlockInfo &block_info = _header.blocks[lut_index];
@ -336,6 +346,7 @@ Error RegionFile::load_block(Vector3i position, VoxelBufferInternal &out_block)
Error RegionFile::save_block(Vector3i position, VoxelBufferInternal &block) { Error RegionFile::save_block(Vector3i position, VoxelBufferInternal &block) {
ERR_FAIL_COND_V(_header.format.verify_block(block) == false, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(_header.format.verify_block(block) == false, ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(!is_valid_block_position(position), ERR_INVALID_PARAMETER);
ERR_FAIL_COND_V(_file_access == nullptr, ERR_FILE_CANT_WRITE); ERR_FAIL_COND_V(_file_access == nullptr, ERR_FILE_CANT_WRITE);
FileAccess *f = _file_access; FileAccess *f = _file_access;
@ -623,6 +634,7 @@ unsigned int RegionFile::get_header_block_count() const {
bool RegionFile::has_block(Vector3i position) const { bool RegionFile::has_block(Vector3i position) const {
ERR_FAIL_COND_V(!is_open(), false); ERR_FAIL_COND_V(!is_open(), false);
ERR_FAIL_COND_V(!is_valid_block_position(position), false);
const unsigned int bi = get_block_index_in_header(position); const unsigned int bi = get_block_index_in_header(position);
return _header.blocks[bi].data != 0; return _header.blocks[bi].data != 0;
} }

2
streams/region/region_file.h
View File

@ -94,6 +94,8 @@ public:
void debug_check(); void debug_check();
bool is_valid_block_position(const Vector3 position) const;
private: private:
bool save_header(FileAccess *f); bool save_header(FileAccess *f);
Error load_header(FileAccess *f); Error load_header(FileAccess *f);