diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-12-19 23:23:30 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-12-19 23:23:30 +0300 |
| commit | fad7121ca3bf150aeb1753873969778391629e0c (patch) | |
| tree | 6763f9d2a5037cf8ac0b1280d8acbaa3bcbce888 /source/blender/blenkernel/intern/customdata.c | |
| parent | b8e47fd160c4474032468390b40ca238381b560f (diff) | |
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.
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 67d485d2dc3..abd78ffe148 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1444,9 +1444,8 @@ static CustomDataLayer *customData_add_layer__internal(CustomData *data, 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 |