[brlcad-commits] CVS: brlcad/src/conv/jack g-jack.c, 1.16, 1.17 jack-g.c, 1.13, 1.14

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/src/conv/jack
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27964/src/conv/jack

Modified Files:
	g-jack.c jack-g.c 
Log Message:
more level 4 flawfinder issues.  mostly string length clampages.

Index: g-jack.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/jack/g-jack.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -w -u -r1.16 -r1.17
--- g-jack.c	15 Sep 2007 16:23:05 -0000	1.16
+++ g-jack.c	14 Oct 2007 22:15:54 -0000	1.17
@@ -57,7 +57,7 @@
 
 extern double nmg_eue_dist;		/* from nmg_plot.c */
 
-static char	usage[] = "\
+static const char usage[] = "\
 Usage: %s [-v] [-d] [-f] [-xX lvl] [-u eu_dist]\n\
 	[-a abs_tess_tol] [-r rel_tess_tol] [-n norm_tess_tol]\n\
 	[-D dist_calc_tol]\n\

Index: jack-g.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/conv/jack/jack-g.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -w -u -r1.13 -r1.14
--- jack-g.c	15 Sep 2007 16:23:05 -0000	1.13
+++ jack-g.c	14 Oct 2007 22:15:54 -0000	1.14
@@ -61,7 +61,7 @@
 
 static struct bn_tol	tol;
 
-static char	usage[] = "Usage: %s [-r region] [-g group] [jack_db] [brlcad_db]\n";
+static const char usage[] = "Usage: %s [-r region] [-g group] [jack_db] [brlcad_db]\n";
 
 BU_EXTERN( fastf_t nmg_loop_plane_area, (const struct loopuse *lu, plane_t pl ) );
 
@@ -141,7 +141,7 @@
 		else
 			base++;
 		reg_name = bu_malloc(sizeof(base)+1, "reg_name");
-		strcpy(reg_name, base);
+		strncpy(reg_name, base, sizeof(base));
 		/* Ignore .pss extension if it's there. */
 		doti = strlen(reg_name) - 4;
 		if (doti > 0 && !strcmp(".pss", reg_name+doti))
@@ -332,13 +332,13 @@
 	rname = bu_malloc(sizeof(reg_name) + 3, "rname");	/* Region name. */
 	sname = bu_malloc(sizeof(reg_name) + 3, "sname");	/* Solid name. */
 
-	sprintf(sname, "s.%s", reg_name);
+	snprintf(sname, sizeof(reg_name) + 2, "s.%s", reg_name);
 	nmg_kill_zero_length_edgeuses( m );
 	nmg_rebound( m, &tol );
 	r = BU_LIST_FIRST( nmgregion, &m->r_hd);
 	s = BU_LIST_FIRST( shell, &r->s_hd );
 	mk_bot_from_nmg(fpout, sname,  s);		/* Make BOT object. */
-	sprintf(rname, "r.%s", reg_name);
+	snprintf(rname, sizeof(reg_name) + 2, "r.%s", reg_name);
 	mk_comb1(fpout, rname, sname, 1);	/* Put object in a region. */
 	if (grp_name) {
 		mk_comb1(fpout, grp_name, rname, 1);	/* Region in group. */