diff -ru sbin/fsdb.orig/fsdb.c sbin/fsdb/fsdb.c
--- sbin/fsdb.orig/fsdb.c	2003-11-01 15:15:59.000000000 -0200
+++ sbin/fsdb/fsdb.c	2004-09-05 01:31:29.000000000 -0300
@@ -549,7 +549,7 @@
 	    testdir.d_namlen = strlen(idesc->id_name);
 	    if (DIRSIZ(NEWDIRFMT, &testdir) <= dirp->d_reclen) {
 		dirp->d_namlen = testdir.d_namlen;
-		strcpy(dirp->d_name, idesc->id_name);
+		strlcpy(dirp->d_name, idesc->id_name, sizeof(dirp->d_name));
 		return STOP|ALTERED|FOUND;
 	    } else
 		return STOP|FOUND;	/* won't fit, so give up */
diff -ru sbin/fsdb.orig/fsdbutil.c sbin/fsdb/fsdbutil.c
--- sbin/fsdb.orig/fsdbutil.c	2004-02-04 15:39:59.000000000 -0200
+++ sbin/fsdb/fsdbutil.c	2004-09-05 01:31:43.000000000 -0300
@@ -202,7 +202,7 @@
 		putchar('\n');
 	    return 0;
 	}
-	j = sprintf(tempbuf, "%d", blkno);
+	j = snprintf(tempbuf, sizeof(tempbuf), "%d", blkno);
 	if (level == 0) {
 	    charssofar += j;
 	    if (charssofar >= cpl - 2) {