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')
;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
