[Bf-blender-cvs] [d4342b3] master: Fix (unreported) memleak in image copy function.

Bastien Montagne noreply at git.blender.org
Thu Jul 21 16:55:33 CEST 2016


Commit: d4342b38971b26d50d86e1bb47fed804db1aef6d
Author: Bastien Montagne
Date:   Thu Jul 21 16:27:30 2016 +0200
Branches: master
https://developer.blender.org/rBd4342b38971b26d50d86e1bb47fed804db1aef6d

Fix (unreported) memleak in image copy function.

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

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

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

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 44bea5c..017eb41 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -456,7 +456,8 @@ Image *BKE_image_copy(Main *bmain, Image *ima)
 
 	copy_image_packedfiles(&nima->packedfiles, &ima->packedfiles);
 
-	nima->stereo3d_format = MEM_dupallocN(ima->stereo3d_format);
+	/* nima->stere3d_format is already allocated by image_alloc... */
+	*nima->stereo3d_format = *ima->stereo3d_format;
 	BLI_duplicatelist(&nima->views, &ima->views);
 
 	BKE_previewimg_id_copy(&nima->id, &ima->id);




More information about the Bf-blender-cvs mailing list