godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47045 from timothyqiu/image-lock-crash

Browse Source 
[3.2] Fix invalid memory usage when modifying locked image
This commit is contained in:
Rémi Verschelde 2021-03-16 08:08:45 +01:00 committed by GitHub
commit bbc87d54dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/image.cpp
View File

@ -1311,8 +1311,8 @@ static void _generate_po2_mipmap(const Component *p_src, Component *p_dst, uint3
} }
void Image::expand_x2_hq2x() { void Image::expand_x2_hq2x() {
ERR_FAIL_COND(!_can_modify(format)); ERR_FAIL_COND(!_can_modify(format));
ERR_FAIL_COND_MSG(write_lock.ptr(), "Cannot modify image when it is locked.");
bool used_mipmaps = has_mipmaps(); bool used_mipmaps = has_mipmaps();
if (used_mipmaps) { if (used_mipmaps) {
@ -2915,6 +2915,7 @@ Ref<Image> Image::rgbe_to_srgb() {
void Image::bumpmap_to_normalmap(float bump_scale) { void Image::bumpmap_to_normalmap(float bump_scale) {
ERR_FAIL_COND(!_can_modify(format)); ERR_FAIL_COND(!_can_modify(format));
ERR_FAIL_COND_MSG(write_lock.ptr(), "Cannot modify image when it is locked.");
convert(Image::FORMAT_RF); convert(Image::FORMAT_RF);
PoolVector<uint8_t> result_image; //rgba output PoolVector<uint8_t> result_image; //rgba output