svn commit: r299020 - stable/10/contrib/netbsd-tests/lib/libc/ssp

[Garrett Cooper]

Author: ngie
Date: Wed May  4 00:29:05 2016
New Revision: 299020
URL: https://svnweb.freebsd.org/changeset/base/299020

Log:
  MFC r298368,r298660:
  
  r298368:
  
  Fix coverity issue with contrib/netbsd-tests/lib/libc/ssp/h_read.c
  
  Ensure opening /dev/zero succeeds. Abort the test if it doesn't.
  
  Also, use _PATH_DEVZERO instead of hardcoding "/dev/zero"
  
  CID: 1251410
  
  r298660:
  
  Fix up r298368
  
  Remove the semicolon accidentally added after the new conditional that tests
  that /dev/zero is opened successfully.
  
  CID: 1354980

Modified:
  stable/10/contrib/netbsd-tests/lib/libc/ssp/h_read.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/lib/libc/ssp/h_read.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/ssp/h_read.c	Wed May  4 00:26:47 2016	(r299019)
+++ stable/10/contrib/netbsd-tests/lib/libc/ssp/h_read.c	Wed May  4 00:29:05 2016	(r299020)
@@ -38,6 +38,7 @@ __RCSID("$NetBSD: h_read.c,v 1.1 2010/12
 
 #ifdef __FreeBSD__
 #include <fcntl.h>
+#include <paths.h>
 
 int
 main(int argc, char *argv[])
@@ -46,7 +47,8 @@ main(int argc, char *argv[])
 	int fd, n;
 	size_t len = atoi(argv[1]);
 
-	fd = open("/dev/zero", O_RDONLY);
+	if ((fd = open(_PATH_DEVZERO, O_RDONLY)) == -1)
+		abort();
 	if ((n = read(fd, b, len)) == -1)
 		abort();
 	(void)printf("%s\n", b);