From 236cc46124f54aa4e162c13d3c69ac29b759804d Mon Sep 17 00:00:00 2001 From: John Safranek Date: Fri, 18 Sep 2026 11:49:18 -0700 Subject: [PATCH] tests: drop the dead descriptor restore results The done: block in test_SendChannelTerminalRequestNoTty() is only entered with a descriptor still open on a path that already set an error code, so the result checks guarding -1494 and -1495 could never be true. Restore the descriptors and keep the original code. --- tests/unit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/unit.c b/tests/unit.c index a7d0c6ba..ae91fd9b 100644 --- a/tests/unit.c +++ b/tests/unit.c @@ -11278,14 +11278,15 @@ static int test_SendChannelTerminalRequestNoTty(void) } done: + /* Only reached with a descriptor still open on an already-failed path, so + * restore it but keep the original error code. Unlike the TERM block + * below, a result check here would never be true. */ if (stdinCopy >= 0) { - if (dup2(stdinCopy, STDIN_FILENO) < 0 && result == 0) - result = -1494; + (void)dup2(stdinCopy, STDIN_FILENO); close(stdinCopy); } if (stdoutCopy >= 0) { - if (dup2(stdoutCopy, STDOUT_FILENO) < 0 && result == 0) - result = -1495; + (void)dup2(stdoutCopy, STDOUT_FILENO); close(stdoutCopy); } if (termPinned) {