griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Memory error 'end corrupt' reports for deform groups... can't find it yet,

Browse Source 
but this code ensures the strcpy() is using BLI_strncpy now, and it uses
more clear names for the mallocs.
This commit is contained in:
Ton Roosendaal
2005-10-20 20:38:08 +00:00
parent c677ffdebb
commit 968b3e7101
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/deform.c
View File

@@ -88,7 +88,7 @@ bDeformGroup* copy_defgroup (bDeformGroup *ingroup)
if (!ingroup)
return NULL;
outgroup=MEM_callocN(sizeof(bDeformGroup), "deformGroup");
outgroup=MEM_callocN(sizeof(bDeformGroup), "copy deformGroup");
/* For now, just copy everything over. */
memcpy (outgroup, ingroup, sizeof(bDeformGroup));

12
source/blender/src/editarmature.c
View File

@@ -126,7 +126,7 @@ static void make_boneList(ListBase* list, ListBase *bones, EditBone *parent)
/* Copy relevant data from bone to eBone */
eBone->parent=parent;
strcpy (eBone->name, curBone->name);
BLI_strncpy (eBone->name, curBone->name, 32);
eBone->flag = curBone->flag;
/* fix selection flags */
@@ -245,7 +245,7 @@ static void editbones_to_armature (ListBase *list, Object *ob)
newBone= MEM_callocN (sizeof(Bone), "bone");
eBone->temp= newBone; /* Associate the real Bones with the EditBones */
strcpy (newBone->name, eBone->name);
BLI_strncpy (newBone->name, eBone->name, 32);
memcpy (newBone->head, eBone->head, sizeof(float)*3);
memcpy (newBone->tail, eBone->tail, sizeof(float)*3);
newBone->flag= eBone->flag;
@@ -1166,7 +1166,7 @@ static EditBone *add_editbone(char *name)
{
EditBone *bone= MEM_callocN(sizeof(EditBone), "eBone");
strcpy (bone->name, name);
BLI_strncpy (bone->name, name, 32);
unique_editbone_name (bone->name);
BLI_addtail(&G.edbo, bone);
@@ -1607,7 +1607,7 @@ void unique_editbone_name (char *name)
for (number = 1; number <=999; number++){
sprintf (tempname, "%s.%03d", name, number);
if (!editbone_name_exists(tempname)){
strcpy (name, tempname);
BLI_strncpy (name, tempname, 32);
return;
}
}
@@ -1703,7 +1703,7 @@ void extrude_armature(int forked)
if(newbone->parent) newbone->flag |= BONE_CONNECTED;
strcpy (newbone->name, ebone->name);
BLI_strncpy (newbone->name, ebone->name, 32);
if(flipbone && forked) { // only set if mirror edit
if(strlen(newbone->name)<30) {
@@ -2361,7 +2361,7 @@ void unique_bone_name (bArmature *arm, char *name)
for (number = 1; number <=999; number++){
sprintf (tempname, "%s.%03d", name, number);
if (!get_named_bone(arm, tempname)){
strcpy (name, tempname);
BLI_strncpy (name, tempname, 32);
return;
}
}

11
source/blender/src/editdeform.c
View File

@@ -144,14 +144,9 @@ bDeformGroup *add_defgroup_name (Object *ob, char *name)
if (!ob)
return NULL;
defgroup = MEM_callocN (sizeof(bDeformGroup), "deformGroup");
defgroup = MEM_callocN (sizeof(bDeformGroup), "add deformGroup");
/* I think there should be some length
* checking here -- don't know why NaN
* never checks name lengths (see
* unique_vertexgroup_name, for example).
*/
strcpy (defgroup->name, name);
BLI_strncpy (defgroup->name, name, 32);
BLI_addtail(&ob->defbase, defgroup);
unique_vertexgroup_name(defgroup, ob);
@@ -606,7 +601,7 @@ void unique_vertexgroup_name (bDeformGroup *dg, Object *ob)
}
}
if (!exists){
strcpy (dg->name, tempname);
BLI_strncpy (dg->name, tempname, 32);
return;
}
}

2
source/blender/src/meshtools.c
View File

@@ -205,7 +205,7 @@ void join_mesh(void)
}
}
if (!odg){
odg = MEM_callocN (sizeof(bDeformGroup), "deformGroup");
odg = MEM_callocN (sizeof(bDeformGroup), "join deformGroup");
memcpy (odg, dg, sizeof(bDeformGroup));
BLI_addtail(&ob->defbase, odg);
}