[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28251] trunk/blender/source/blender/ editors/space_node/node_draw.c: was using uninitialized string for node name display, also use sizeof() rather then fixed values.

Campbell Barton ideasman42 at gmail.com
Sun Apr 18 10:54:42 CEST 2010


Revision: 28251
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28251
Author:   campbellbarton
Date:     2010-04-18 10:54:42 +0200 (Sun, 18 Apr 2010)

Log Message:
-----------
was using uninitialized string for node name display, also use sizeof() rather then fixed values.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_draw.c

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2010-04-18 05:13:58 UTC (rev 28250)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2010-04-18 08:54:42 UTC (rev 28251)
@@ -736,10 +736,10 @@
 		UI_ThemeColor(TH_TEXT);
 	
 	if(node->flag & NODE_CUSTOM_NAME)
-		BLI_strncpy(showname, node->name, 32);
+		BLI_strncpy(showname, node->name, sizeof(showname));
 	else
 		/* todo: auto name display for node types */
-		BLI_strncpy(showname, node->name, 32);
+		BLI_strncpy(showname, node->name, sizeof(showname));
 
 	//if(node->flag & NODE_MUTED)
 	//	sprintf(showname, "[%s]", showname);
@@ -900,10 +900,10 @@
 
 
 		if(node->flag & NODE_CUSTOM_NAME)
-			BLI_strncpy(showname, node->name, 128);
+			BLI_strncpy(showname, node->name, sizeof(showname));
 		else
 			/* todo: auto name display */
-			BLI_strncpy(showname, node->name, 128);
+			BLI_strncpy(showname, node->name, sizeof(showname));
 	
 		//if(node->flag & NODE_MUTED)
 		//	sprintf(showname, "[%s]", showname);
@@ -1045,9 +1045,9 @@
 	UI_ThemeColor(TH_TEXT_HI);
 
 	if (gnode->flag & NODE_CUSTOM_NAME)
-		strcat(showname, gnode->name);
+		BLI_strncpy(showname, gnode->name, sizeof(showname));
 	else
-		strcpy(showname, ngroup->id.name+2);
+		BLI_strncpy(showname, ngroup->id.name+2, sizeof(showname));
 
 	// XXX this shows some scaling artifacts
 	UI_DrawString(rect.xmin+8.0f, rect.ymax+5.0f, showname);





More information about the Bf-blender-cvs mailing list