From 42fd22531f6d53dccdf3f21efb6b6bcc08c1b51b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 18 Feb 2010 10:14:49 +0000 Subject: constraints unique name length was set too long (could overrun the buffer), use sizeof() with other instances of BLI_uniquename too --- source/blender/editors/animation/keyframing.c | 6 +++--- source/blender/editors/armature/poselib.c | 4 ++-- source/blender/editors/space_outliner/outliner.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 58db9cade04..78d579cae4e 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -187,10 +187,10 @@ FCurve *verify_fcurve (bAction *act, const char group[], const char rna_path[], grp= MEM_callocN(sizeof(bActionGroup), "bActionGroup"); grp->flag = AGRP_SELECTED; - BLI_snprintf(grp->name, 64, group); - + strncpy(grp->name, group, sizeof(grp->name)); + BLI_addtail(&act->groups, grp); - BLI_uniquename(&act->groups, grp, "Group", '.', offsetof(bActionGroup, name), 64); + BLI_uniquename(&act->groups, grp, "Group", '.', offsetof(bActionGroup, name), sizeof(grp->name)); } /* add F-Curve to group */ diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index f251fee236b..5cf44951c37 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -373,7 +373,7 @@ static int poselib_add_exec (bContext *C, wmOperator *op) } /* validate name */ - BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), 64); + BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), sizeof(marker->name)); /* init common-key-source for use by KeyingSets */ memset(&cks, 0, sizeof(bCommonKeySrc)); @@ -578,7 +578,7 @@ static int poselib_rename_exec (bContext *C, wmOperator *op) /* copy name and validate it */ BLI_strncpy(marker->name, newname, sizeof(marker->name)); - BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), 64); + BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), sizeof(marker->name)); /* done */ return OPERATOR_FINISHED; diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index c4db054ff50..795546fdda7 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -4885,7 +4885,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) Object *ob= (Object *)tselem->id; // id = object bActionGroup *grp= te->directdata; - BLI_uniquename(&ob->pose->agroups, grp, "Group", '.', offsetof(bActionGroup, name), 32); + BLI_uniquename(&ob->pose->agroups, grp, "Group", '.', offsetof(bActionGroup, name), sizeof(grp->name)); WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob); } break; -- cgit v1.2.3