Prevent crash when not supplying optional parameter to uv_on_emitter
ClosedPublic
Actions

Authored by Robert Guetzkow (rjg) on Jan 17 2021, 12:37 AM.

Details

Reviewers

Campbell Barton (campbellbarton)
Bastien Montagne (mont29)
Jacques Lucke (JacquesLucke)

Maniphest Tasks

T84588: uv_on_emitter crash

Commits

rB821df20797be: Fix T84588: Set parameter as required for uv_on_emitter

Summary

This patch fixes T84588's second issue. The particle parameter is optional in the Python API of bpy.types.ParticleSystem.uv_on_emitter, however it isn't properly validated that it may be None. This lead to the dereferencing of a NULL-pointer in rna_ParticleSystem_tessfaceidx_on_emitter called by rna_ParticleSystem_uv_on_emitter. The fix is to add a NULL check and return a negative value like when the other pointers are NULL.

Diff Detail

Repository: rB Blender

Event Timeline

Robert Guetzkow (rjg) requested review of this revision.Jan 17 2021, 12:37 AM

Robert Guetzkow (rjg) created this revision.

Harbormaster completed remote builds in B12230: Diff 32842.Jan 17 2021, 12:37 AM

Robert Guetzkow (rjg) edited the summary of this revision. (Show Details)Jan 17 2021, 12:38 AM

Robert Guetzkow (rjg) added reviewers: Campbell Barton (campbellbarton), Bastien Montagne (mont29).Jan 18 2021, 12:35 PM

Seems like the error is actually in rna.

diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index c42d891c389..ab8c1b0bb3f 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -4016,7 +4016,7 @@ static void rna_def_particle_system(BlenderRNA *brna)
   RNA_def_function_flag(func, FUNC_USE_REPORTS);
   parm = RNA_def_pointer(func, "modifier", "ParticleSystemModifier", "", "Particle modifier");
   RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
-  prop = RNA_def_pointer(func, "particle", "Particle", "", "Particle");
+  parm = RNA_def_pointer(func, "particle", "Particle", "", "Particle");
   RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
   RNA_def_int(func, "particle_no", 0, INT_MIN, INT_MAX, "Particle no", "", INT_MIN, INT_MAX);
   RNA_def_int(func, "uv_no", 0, INT_MIN, INT_MAX, "UV no", "", INT_MIN, INT_MAX);

@Jacques Lucke (JacquesLucke) Will take another look at this tomorrow.

@Jacques Lucke (JacquesLucke) it looks like you're absolutely right and the parameter was never intended to be optional. I will update the patch accordingly.