diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-07-19 19:43:10 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-07-19 19:43:10 +0000 |
| commit | 2fef18f836c6d1b45a6f2e0fc9b0da55e2b938e8 (patch) | |
| tree | cb2c5a1771dbd66cdb5062d766e107ae426e2a4b /lib | |
| parent | b40b48b8769a8071ca3f1065110fda1ec1406bff (diff) | |
| parent | 4555b2ad92a947f7373b75f8734d16a5b41710d8 (diff) | |
| download | src-2fef18f836c6d1b45a6f2e0fc9b0da55e2b938e8.tar.gz src-2fef18f836c6d1b45a6f2e0fc9b0da55e2b938e8.zip | |
Merge ^/head r320994 through r321238.
Notes
Notes:
svn path=/projects/clang500-import/; revision=321239
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libsysdecode/mkioctls | 4 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_barrier.c | 2 | ||||
| -rw-r--r-- | lib/libutil/tests/Makefile | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/lib/libsysdecode/mkioctls b/lib/libsysdecode/mkioctls index e5bcee2338e8..743029a24f20 100644 --- a/lib/libsysdecode/mkioctls +++ b/lib/libsysdecode/mkioctls @@ -18,14 +18,12 @@ LC_ALL=C; export LC_ALL ioctl_includes=$( cd $includedir find -H -s * -name '*.h' | \ - egrep -v '(.*disk.*|net/pfvar|net/if_pfsync)\.h' | \ + egrep -v '(net/pfvar|net/if_pfsync)\.h' | \ xargs egrep -l \ '^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' | awk '{printf("#include <%s>\\n", $1)}' ) -ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n" - awk -v x="$ioctl_includes" 'BEGIN {print x}' | $CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - | awk -v ioctl_includes="$ioctl_includes" ' diff --git a/lib/libthr/thread/thr_barrier.c b/lib/libthr/thread/thr_barrier.c index 16fd3694ea05..2c47f13f2669 100644 --- a/lib/libthr/thread/thr_barrier.c +++ b/lib/libthr/thread/thr_barrier.c @@ -100,7 +100,7 @@ _pthread_barrier_init(pthread_barrier_t *barrier, pthread_barrier_t bar; int pshared; - if (barrier == NULL || count == 0) + if (barrier == NULL || count == 0 || count > INT_MAX) return (EINVAL); if (attr == NULL || *attr == NULL || diff --git a/lib/libutil/tests/Makefile b/lib/libutil/tests/Makefile index 632a4373645c..5414042762af 100644 --- a/lib/libutil/tests/Makefile +++ b/lib/libutil/tests/Makefile @@ -3,9 +3,7 @@ TAP_TESTS_C+= flopen_test TAP_TESTS_C+= grp_test TAP_TESTS_C+= humanize_number_test -.if ${MACHINE_CPUARCH} != "aarch64" # PR202304: pidfile_test hangs on arm64 TAP_TESTS_C+= pidfile_test -.endif TAP_TESTS_C+= trimdomain_test TAP_TESTS_C+= trimdomain-nodomain_test |