Mon Dec 12 23:54:18 2011 UTC ()
Remove bogus check that (a) depends uninitialised memory (b) overflows a
buffer.


(joerg)
diff -r1.6 -r1.7 src/tests/lib/libpthread/t_join.c
cvs diff -r1.6 -r1.7 src/tests/lib/libpthread/t_join.c (expand / switch to unified diff)

--- src/tests/lib/libpthread/t_join.c 2011/08/22 00:35:07 1.6
+++ src/tests/lib/libpthread/t_join.c 2011/12/12 23:54:18 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: t_join.c,v 1.6 2011/08/22 00:35:07 dholland Exp $ */ 1/* $NetBSD: t_join.c,v 1.7 2011/12/12 23:54:18 joerg Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2010 The NetBSD Foundation, Inc. 4 * Copyright (c) 2010 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jukka Ruohonen. 8 * by Jukka Ruohonen.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -19,27 +19,27 @@ @@ -19,27 +19,27 @@
19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31#include <sys/cdefs.h> 31#include <sys/cdefs.h>
32__RCSID("$NetBSD: t_join.c,v 1.6 2011/08/22 00:35:07 dholland Exp $"); 32__RCSID("$NetBSD: t_join.c,v 1.7 2011/12/12 23:54:18 joerg Exp $");
33 33
34#include <errno.h> 34#include <errno.h>
35#include <pthread.h> 35#include <pthread.h>
36#include <stdint.h> 36#include <stdint.h>
37 37
38#include <atf-c.h> 38#include <atf-c.h>
39 39
40#include "h_common.h" 40#include "h_common.h"
41 41
42#ifdef CHECK_STACK_ALIGNMENT 42#ifdef CHECK_STACK_ALIGNMENT
43extern int check_stack_alignment(void); 43extern int check_stack_alignment(void);
44#endif 44#endif
45 45
@@ -93,33 +93,26 @@ threadfunc1(void *arg) @@ -93,33 +93,26 @@ threadfunc1(void *arg)
93 */ 93 */
94 ATF_REQUIRE(rv != 0); 94 ATF_REQUIRE(rv != 0);
95 ATF_REQUIRE_EQ(rv, EDEADLK); 95 ATF_REQUIRE_EQ(rv, EDEADLK);
96 96
97 for (i = 0; i < __arraycount(thread); i++) { 97 for (i = 0; i < __arraycount(thread); i++) {
98 98
99 error = true; 99 error = true;
100 100
101 rv = pthread_create(&thread[i], NULL, threadfunc2, (void *)i); 101 rv = pthread_create(&thread[i], NULL, threadfunc2, (void *)i);
102 102
103 ATF_REQUIRE_EQ(rv, 0); 103 ATF_REQUIRE_EQ(rv, 0);
104 104
105 /* 105 /*
106 * Try to join an invalid thread. 
107 */ 
108 rv = pthread_join(thread[i + 1], NULL); 
109 
110 ATF_REQUIRE_EQ(rv, ESRCH); 
111 
112 /* 
113 * Check join and exit condition. 106 * Check join and exit condition.
114 */ 107 */
115 PTHREAD_REQUIRE(pthread_join(thread[i], &val)); 108 PTHREAD_REQUIRE(pthread_join(thread[i], &val));
116 109
117 ATF_REQUIRE_EQ(error, false); 110 ATF_REQUIRE_EQ(error, false);
118 111
119 ATF_REQUIRE(val != NULL); 112 ATF_REQUIRE(val != NULL);
120 ATF_REQUIRE(val == (void *)(i + 1)); 113 ATF_REQUIRE(val == (void *)(i + 1));
121 114
122 /* 115 /*
123 * Once the thread has returned, ESRCH should 116 * Once the thread has returned, ESRCH should
124 * again follow if we try to join it again. 117 * again follow if we try to join it again.
125 */ 118 */