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

minor changes for confusing code.

Browse Source 
- memset() was argument was truncated.
- outliner had redundant NULL check.
- node texture was allocating memory to make a unique name which isnt needed for a fixed size string.
This commit is contained in:
Campbell Barton
2013-07-29 04:45:40 +00:00
parent a25f00301f
commit 33a9cb6caa
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/render/render_preview.c
View File

@@ -964,7 +964,7 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat
br->icon_imbuf = get_brush_icon(br);
memset(sp->pr_rect, 0x888888, sp->sizex * sp->sizey * sizeof(unsigned int));
memset(sp->pr_rect, 0x88, sp->sizex * sp->sizey * sizeof(unsigned int));
if (!(br->icon_imbuf) || !(br->icon_imbuf->rect))
return;

2
source/blender/editors/space_outliner/outliner_tree.c
View File

@@ -1131,7 +1131,7 @@ static int need_add_seq_dup(Sequence *seq)
{
Sequence *p;
if ((!seq->strip) || (!seq->strip->stripdata) || (!seq->strip->stripdata->name))
if ((!seq->strip) || (!seq->strip->stripdata))
return(1);
/*

15
source/blender/nodes/texture/nodes/node_texture_output.c
View File

@@ -80,12 +80,13 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
static void unique_name(bNode *node)
{
TexNodeOutput *tno = (TexNodeOutput *)node->storage;
char *new_name = NULL;
char new_name[sizeof(tno->name)];
int new_len = 0;
int suffix;
bNode *i;
char *name = tno->name;
new_name[0] = '\0';
i = node;
while (i->prev) i = i->prev;
for (; i; i = i->next) {
@@ -96,7 +97,7 @@ static void unique_name(bNode *node)
continue;
}
if (!new_name) {
if (new_name[0] == '\0') {
int len = strlen(name);
if (len >= 4 && sscanf(name + len - 4, ".%03d", &suffix) == 1) {
new_len = len;
@@ -107,17 +108,15 @@ static void unique_name(bNode *node)
if (new_len > (sizeof(tno->name) - 1))
new_len = (sizeof(tno->name) - 1);
}
new_name = MEM_mallocN(new_len + 1, "new_name");
strcpy(new_name, name);
BLI_strncpy(new_name, name, sizeof(tno->name));
name = new_name;
}
sprintf(new_name + new_len - 4, ".%03d", ++suffix);
}
if (new_name) {
strcpy(tno->name, new_name);
MEM_freeN(new_name);
if (new_name[0] != '\0') {
BLI_strncpy(tno->name, new_name, sizeof(tno->name));
}
}