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

fix for passing NULL to strstr() in visualkey_can_use()

Browse Source
This commit is contained in:
Campbell Barton
2011-09-12 00:13:49 +00:00
parent 2827ee26e5
commit 56460a0340
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/animation/keyframing.c
View File

@@ -531,7 +531,7 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
bConstraint *con= NULL;
short searchtype= VISUALKEY_NONE;
short has_parent = FALSE;
char *identifier= NULL;
const char *identifier= NULL;
/* validate data */
// TODO: this check is probably not needed, but it won't hurt
@@ -548,7 +548,7 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
Object *ob= (Object *)ptr->data;
con= ob->constraints.first;
identifier= (char *)RNA_property_identifier(prop);
identifier= RNA_property_identifier(prop);
has_parent= (ob->parent != NULL);
}
else if (ptr->type == &RNA_PoseBone) {
@@ -556,7 +556,7 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
bPoseChannel *pchan= (bPoseChannel *)ptr->data;
con= pchan->constraints.first;
identifier= (char *)RNA_property_identifier(prop);
identifier= RNA_property_identifier(prop);
has_parent= (pchan->parent != NULL);
}
@@ -565,12 +565,18 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
return 0;
/* location or rotation identifiers only... */
if (strstr(identifier, "location"))
if(identifier == NULL) {
printf("%s failed: NULL identifier\n", __func__);
return 0;
}
else if (strstr(identifier, "location")) {
searchtype= VISUALKEY_LOC;
else if (strstr(identifier, "rotation"))
}
else if (strstr(identifier, "rotation")) {
searchtype= VISUALKEY_ROT;
}
else {
printf("visualkey_can_use() failed: identifier - '%s' \n", identifier);
printf("%s failed: identifier - '%s' \n", __func__, identifier);
return 0;
}