[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20629] trunk/blender/source/blender/src/ buttons_editing.c: Bugfix

Ton Roosendaal ton at blender.org
Thu Jun 4 17:44:43 CEST 2009


Revision: 20629
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20629
Author:   ton
Date:     2009-06-04 17:44:43 +0200 (Thu, 04 Jun 2009)

Log Message:
-----------
Bugfix

Loading font used a minimal string array (80 chars) and copied file name
strings in it without size checks. Triple tsk!

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_editing.c

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2009-06-04 15:23:34 UTC (rev 20628)
+++ trunk/blender/source/blender/src/buttons_editing.c	2009-06-04 15:44:43 UTC (rev 20629)
@@ -2919,7 +2919,7 @@
 	VFont *vf;
 	Object *ob;
 	ScrArea *sa;
-	char str[80];
+	char str[FILE_MAX];
 	int ctevt;
 	char *ctmenu;
 	DynStr *ds;
@@ -2988,8 +2988,8 @@
 		break;
 	case B_LOADFONT:
 		vf= give_vfontpointer(G.buts->texnr);
-		if(vf && vf->id.prev!=vf->id.next) strcpy(str, vf->name);
-		else strcpy(str, U.fontdir);
+		if(vf && vf->id.prev!=vf->id.next) BLI_strncpy(str, vf->name, FILE_MAX);
+		else BLI_strncpy(str, U.fontdir, FILE_MAX);
 
 		sa= closest_bigger_area();
 		areawinset(sa->win);





More information about the Bf-blender-cvs mailing list