From 9fce8c898eb411c629f5948025a2ec3c6555599d Mon Sep 17 00:00:00 2001
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Mon, 14 Nov 2005 17:39:00 +0000
Subject: [PATCH] In build_iovec(), if passed in len is -1, check to see if val
 is NULL before doing strlen() to calculate new len.

Submitted by:	maxim
---
 sbin/mount/getmntopts.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index f0026f48cd2b..0c0e0fed807a 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <sys/uio.h>
 
-#include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <stdarg.h>
@@ -155,8 +154,12 @@ build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val,
 	(*iov)[i].iov_len = strlen(name) + 1;
 	i++;
 	(*iov)[i].iov_base = val;
-	if (len == (size_t)-1)
-		len = strlen(val) + 1;
+	if (len == (size_t)-1) {
+		if (val != NULL)
+			len = strlen(val) + 1;
+		else
+			len = 0;
+	}
 	(*iov)[i].iov_len = (int)len;
 	*iovlen = ++i;
 }