[Bf-blender-cvs] [4580ace4c1] master: Alembic/CacheFile: fix crash de-referencing NULL pointer.

Kévin Dietrich noreply at git.blender.org
Mon Jan 30 10:55:46 CET 2017


Commit: 4580ace4c1fe984f707385ea0318c53389fd2916
Author: Kévin Dietrich
Date:   Mon Jan 30 10:46:24 2017 +0100
Branches: master
https://developer.blender.org/rB4580ace4c1fe984f707385ea0318c53389fd2916

Alembic/CacheFile: fix crash de-referencing NULL pointer.

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

M	source/blender/blenkernel/intern/cachefile.c

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

diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index deeb35bd88..3dce08eb75 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -215,7 +215,9 @@ void BKE_cachefile_clean(Scene *scene, CacheFile *cache_file)
 
 			if (cache_file == mcmd->cache_file) {
 #ifdef WITH_ALEMBIC
-				CacheReader_free(mcmd->reader);
+				if (mcmd->reader != NULL) {
+					CacheReader_free(mcmd->reader);
+				}
 #endif
 				mcmd->reader = NULL;
 				mcmd->object_path[0] = '\0';
@@ -231,7 +233,9 @@ void BKE_cachefile_clean(Scene *scene, CacheFile *cache_file)
 
 			if (cache_file == data->cache_file) {
 #ifdef WITH_ALEMBIC
-				CacheReader_free(data->reader);
+				if (data->reader != NULL) {
+					CacheReader_free(data->reader);
+				}
 #endif
 				data->reader = NULL;
 				data->object_path[0] = '\0';




More information about the Bf-blender-cvs mailing list