[Bf-blender-cvs] [0a6c57d3d2e] master: Fix crash from freeing of NULL pointer

Mai Lavelle noreply at git.blender.org
Tue May 16 22:35:37 CEST 2017


Commit: 0a6c57d3d2e6c9540e6bd298089e6fc8e2c5f2b0
Author: Mai Lavelle
Date:   Tue May 16 16:29:27 2017 -0400
Branches: master
https://developer.blender.org/rB0a6c57d3d2e6c9540e6bd298089e6fc8e2c5f2b0

Fix crash from freeing of NULL pointer

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

M	source/blender/imbuf/intern/metadata.c

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

diff --git a/source/blender/imbuf/intern/metadata.c b/source/blender/imbuf/intern/metadata.c
index d48aec0ba4c..da39967a4fe 100644
--- a/source/blender/imbuf/intern/metadata.c
+++ b/source/blender/imbuf/intern/metadata.c
@@ -83,7 +83,7 @@ void IMB_metadata_copy(struct ImBuf *dimb, struct ImBuf *simb)
 {
 	BLI_assert(dimb != simb);
 	if (simb->metadata) {
-		IDP_FreeProperty(dimb->metadata);
+		IMB_metadata_free(dimb);
 		dimb->metadata = IDP_CopyProperty(simb->metadata);
 	}
 }




More information about the Bf-blender-cvs mailing list