From owner-svn-src-all@FreeBSD.ORG  Thu Oct 11 08:18:28 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D695E68D;
 Thu, 11 Oct 2012 08:18:28 +0000 (UTC)
 (envelope-from stefanf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id BEC238FC16;
 Thu, 11 Oct 2012 08:18:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9B8ISlg086765;
 Thu, 11 Oct 2012 08:18:28 GMT (envelope-from stefanf@svn.freebsd.org)
Received: (from stefanf@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9B8ISSE086763;
 Thu, 11 Oct 2012 08:18:28 GMT (envelope-from stefanf@svn.freebsd.org)
Message-Id: <201210110818.q9B8ISSE086763@svn.freebsd.org>
From: Stefan Farfeleder <stefanf@FreeBSD.org>
Date: Thu, 11 Oct 2012 08:18:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241441 - head/lib/libc/gen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Oct 2012 08:18:28 -0000

Author: stefanf
Date: Thu Oct 11 08:18:28 2012
New Revision: 241441
URL: http://svn.freebsd.org/changeset/base/241441

Log:
  Fix my last commit.  Only call strunvis after properly checking the argument is
  not NULL.

Modified:
  head/lib/libc/gen/fstab.c

Modified: head/lib/libc/gen/fstab.c
==============================================================================
--- head/lib/libc/gen/fstab.c	Thu Oct 11 07:54:29 2012	(r241440)
+++ head/lib/libc/gen/fstab.c	Thu Oct 11 08:18:28 2012	(r241441)
@@ -150,16 +150,18 @@ fstabscan(void)
 /* OLD_STYLE_FSTAB */
 		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
 			;
-		if (strunvis(cp, cp) < 0)
-			goto bad;
 		_fs_fstab.fs_spec = cp;
-		if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#')
+		if (_fs_fstab.fs_spec == NULL || *_fs_fstab.fs_spec == '#')
 			continue;
+		if (strunvis(_fs_fstab.fs_spec, _fs_fstab.fs_spec) < 0)
+			goto bad;
 		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
 			;
-		if (strunvis(cp, cp) < 0)
-			goto bad;
 		_fs_fstab.fs_file = cp;
+		if (_fs_fstab.fs_file == NULL)
+			goto bad;
+		if (strunvis(_fs_fstab.fs_file, _fs_fstab.fs_file) < 0)
+			goto bad;
 		fixfsfile();
 		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
 			;