From bb218f8d923ea9bac42c37bb7cf190b4dbd695f1 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 13 Aug 2009 12:11:47 -0600 Subject: [PATCH] test-dup2: fix bad assumption * tests/test-dup2.c (main): Tolerate leaked fds from environment. Reported by Peter Breitenlohner . Signed-off-by: Eric Blake --- ChangeLog | 4 ++++ tests/test-dup2.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 960f3cc42c..d6c3670e6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-08-13 Eric Blake + test-dup2: fix bad assumption + * tests/test-dup2.c (main): Tolerate leaked fds from environment. + Reported by Peter Breitenlohner . + test-version-etc: fix CRLF portability issue * tests/test-version-etc.sh: Use tr, not sed, as not all sed recognize \r. diff --git a/tests/test-dup2.c b/tests/test-dup2.c index 67f49eff05..2009aaa263 100644 --- a/tests/test-dup2.c +++ b/tests/test-dup2.c @@ -67,8 +67,12 @@ main () char buffer[1]; int fd = open (file, O_CREAT | O_RDWR, 0600); - ASSERT (0 <= fd); + /* Assume std descriptors were provided by invoker. */ + ASSERT (STDERR_FILENO < fd); ASSERT (is_open (fd)); + /* Ignore any other fd's leaked into this process. */ + close (fd + 1); + close (fd + 2); ASSERT (!is_open (fd + 1)); ASSERT (!is_open (fd + 2)); -- 2.30.2