[Bf-blender-cvs] [b211e41] master: Fix memory & file-handle leak w/ custom data write

Campbell Barton noreply at git.blender.org
Mon Jan 11 03:26:39 CET 2016


Commit: b211e4193f2ea1a1cffef6b4b76ae5597922fec2
Author: Campbell Barton
Date:   Mon Jan 11 13:14:30 2016 +1100
Branches: master
https://developer.blender.org/rBb211e4193f2ea1a1cffef6b4b76ae5597922fec2

Fix memory & file-handle leak w/ custom data write

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

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

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 32a21e6..c0ebcfa 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -3631,6 +3631,7 @@ void CustomData_external_write(CustomData *data, ID *id, CustomDataMask mask, in
 
 	if (!cdf_write_open(cdf, filename)) {
 		fprintf(stderr, "Failed to open %s for writing.\n", filename);
+		cdf_free(cdf);
 		return;
 	}
 
@@ -3657,6 +3658,7 @@ void CustomData_external_write(CustomData *data, ID *id, CustomDataMask mask, in
 
 	if (i != data->totlayer) {
 		fprintf(stderr, "Failed to write data to %s.\n", filename);
+		cdf_write_close(cdf);
 		cdf_free(cdf);
 		return;
 	}




More information about the Bf-blender-cvs mailing list