[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26715] trunk/blender/source/blender/ editors/interface/interface.c: [#20987] A small bug in logic editor

Campbell Barton ideasman42 at gmail.com
Mon Feb 8 20:24:13 CET 2010


Revision: 26715
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26715
Author:   campbellbarton
Date:     2010-02-08 20:24:13 +0100 (Mon, 08 Feb 2010)

Log Message:
-----------
[#20987] A small bug in logic editor
string was used, uninitialized.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface.c

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2010-02-08 18:00:27 UTC (rev 26714)
+++ trunk/blender/source/blender/editors/interface/interface.c	2010-02-08 19:24:13 UTC (rev 26715)
@@ -1499,7 +1499,7 @@
 		}
 
 		if(!buf) {
-			BLI_strncpy(str, "", maxlen);
+			str[0] = '\0';
 		}
 		else if(buf && buf != str) {
 			/* string was too long, we have to truncate */
@@ -1511,12 +1511,12 @@
 		/* ID pointer */
 		if(but->idpoin_idpp) { /* Can be NULL for ID properties by python */
 			ID *id= *(but->idpoin_idpp);
-			if(id)
+			if(id) {
 				BLI_strncpy(str, id->name+2, maxlen);
+				return;
+			}
 		}
-		else {
-			str[0] = '\0';
-		}
+		str[0] = '\0';
 		return;
 	}
 	else if(but->type == TEX) {
@@ -2067,7 +2067,7 @@
 		
 	case HOTKEYEVT:
 		if (but->flag & UI_SELECT) {
-			strncpy(but->drawstr, "", UI_MAX_DRAW_STR);
+			but->drawstr[0]= '\0';
 			
 			if(but->modifier_key) {
 				char *str= but->drawstr;





More information about the Bf-blender-cvs mailing list