diff options
| author | Andreas Haas <Hinsbart@users.noreply.github.com> | 2017-05-15 20:05:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 20:05:33 +0200 |
| commit | aecab985b5736c60af2e3d794a6f7d9e25272c11 (patch) | |
| tree | 61da885b4accfdd7f557188f31802b091c99b519 /drivers | |
| parent | 76289b5d5a9516e2b6d9001eb1c10163a616e981 (diff) | |
| parent | 9d7d24682d5efd9cafb1e0fa52764bc44cf17b6b (diff) | |
Merge pull request #8772 from honix/master
Particles potential crash fix
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 1025acceb4..eed2afe71f 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -4859,6 +4859,7 @@ void RasterizerStorageGLES3::particles_set_amount(RID p_particles, int p_amount) Particles *particles = particles_owner.getornull(p_particles); ERR_FAIL_COND(!particles); + ERR_FAIL_COND(p_amount < 1); particles->amount = p_amount; @@ -4912,6 +4913,7 @@ void RasterizerStorageGLES3::particles_set_lifetime(RID p_particles, float p_lif Particles *particles = particles_owner.getornull(p_particles); ERR_FAIL_COND(!particles); + ERR_FAIL_COND(p_lifetime <= 0); particles->lifetime = p_lifetime; } void RasterizerStorageGLES3::particles_set_pre_process_time(RID p_particles, float p_time) { |