[Bf-blender-cvs] [0ea952df43b] fluid-mantaflow: Mantaflow: Sanity check required when reading older files

[Sebastián Barschkis]

Commit: 0ea952df43b27340127a8f73c513e3647c7b7a5a
Author: Sebastián Barschkis
Date:   Wed Nov 20 12:54:31 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB0ea952df43b27340127a8f73c513e3647c7b7a5a

Mantaflow: Sanity check required when reading older files

===================================================================

M	source/blender/blenkernel/intern/modifier.c
M	source/blender/blenkernel/intern/particle.c

===================================================================

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 9fb11d26938..ade41e40544 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -156,6 +156,10 @@ static void modifier_free_data_id_us_cb(void *UNUSED(userData),
 
 void modifier_free_ex(ModifierData *md, const int flag)
 {
+  if (!md) {
+    return;
+  }
+
   const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
   if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 610224fe409..1e972bdf296 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -360,6 +360,11 @@ bool psys_check_enabled(Object *ob, ParticleSystem *psys, const bool use_render_
   }
 
   psmd = psys_get_modifier(ob, psys);
+
+  if (!psmd) {
+    return 0;
+  }
+
   if (use_render_params) {
     if (!(psmd->modifier.mode & eModifierMode_Render)) {
       return 0;