diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-28 08:37:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 08:37:59 +0100 |
| commit | 63c5cd7eb89c5e7d24465b910eb6015b344c3f5f (patch) | |
| tree | 0da485fc1328f59d10b8c0a04074db3e729c2fa5 /drivers/gles2 | |
| parent | 826ffc26c985db7cbaaa3fef4c60af8fef514f0c (diff) | |
| parent | e53e1c566ac9e2e9b829f1cdbfd5d27537053cd1 (diff) | |
Merge pull request #33104 from qarmin/fix_some_crashes
Fix some crashes and using null pointers
Diffstat (limited to 'drivers/gles2')
| -rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index 775dfa513c..0f51d07b6e 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -665,6 +665,7 @@ void RasterizerStorageGLES2::texture_set_data(RID p_texture, const Ref<Image> &p texture->data_size = img->get_data().size(); PoolVector<uint8_t>::Read read = img->get_data().read(); + ERR_FAIL_COND(!read.ptr()); glActiveTexture(GL_TEXTURE0); glBindTexture(texture->target, texture->tex_id); @@ -3236,12 +3237,14 @@ Color RasterizerStorageGLES2::multimesh_instance_get_custom_data(RID p_multimesh void RasterizerStorageGLES2::multimesh_set_as_bulk_array(RID p_multimesh, const PoolVector<float> &p_array) { MultiMesh *multimesh = multimesh_owner.getornull(p_multimesh); ERR_FAIL_COND(!multimesh); + ERR_FAIL_COND(!multimesh->data.ptr()); int dsize = multimesh->data.size(); ERR_FAIL_COND(dsize != p_array.size()); PoolVector<float>::Read r = p_array.read(); + ERR_FAIL_COND(!r.ptr()); copymem(multimesh->data.ptrw(), r.ptr(), dsize * sizeof(float)); multimesh->dirty_data = true; |