diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 921f08d243e..1de896e9fff 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -975,13 +975,15 @@ setugidsafety(p)
 
 	fpp = fdp->fd_ofiles;
 	fdfp = fdp->fd_ofileflags;
-	for (i = 0; i <= 2 && i <= fdp->fd_lastfile; i++, fpp++, fdfp++) {
+	for (i = 0; i <= fdp->fd_lastfile; i++, fpp++, fdfp++) {
+		if (i > 2)
+			break;
 		if (*fpp != NULL && is_unsafe(*fpp)) {
 			if ((*fdfp & UF_MAPPED) != 0)
-				(void)munmapfd(p, i);
-			(void)closef(*fpp, p);
+				(void) munmapfd(p, i);
+			(void) closef(*fpp, p);
 			*fpp = NULL;
-			*fdfp = '\0';
+			*fdfp = 0;
 			if (i < fdp->fd_freefile)
 				fdp->fd_freefile = i;
 		}