[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33797] trunk/blender/source/blender/ blenkernel/intern/customdata.c: Apply [#25296] Fix for [#24636]

[Nathan Letwory]

Revision: 33797
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33797
Author:   jesterking
Date:     2010-12-19 21:23:30 +0100 (Sun, 19 Dec 2010)

Log Message:
-----------
Apply [#25296] Fix for [#24636]
Bug reported by Dominique Lorre
Fix submitted by Jeroen Bakker

When importing COLLADA files, the name of a custom data layer can be longer than 32 bytes. Make sure only 32 bytes are copied.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c	2010-12-19 20:12:12 UTC (rev 33796)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c	2010-12-19 20:23:30 UTC (rev 33797)
@@ -1444,9 +1444,8 @@
 	data->layers[index].type = type;
 	data->layers[index].flag = flag;
 	data->layers[index].data = newlayerdata;
-
 	if(name || (name=typeInfo->defaultname)) {
-		strcpy(data->layers[index].name, name);
+		BLI_strncpy(data->layers[index].name, name, 32);
 		CustomData_set_layer_unique_name(data, index);
 	}
 	else