Skip to content

Drop dead code found by Coverity #1268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ejohnstown wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −8
Open

Drop dead code found by Coverity #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9a4e68
internal: drop the unreachable format reject
ejohnstown Sep 18, 2026
cb6cbf9
tests: drop the dead descriptor restore results
ejohnstown Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3353,7 +3353,8 @@ int wolfSSH_ProcessBuffer(WOLFSSH_CTX* ctx,
derSz = inSz;
}
}
else if (format == WOLFSSH_FORMAT_PEM) {
/* WOLFSSH_FORMAT_PEM; the format check above admits no other value. */
else {
#ifdef WOLFSSH_CERTS
if (type == BUFTYPE_CA) {
/* A CA buffer may hold a bundle, so every block is loaded. */
Expand Down Expand Up @@ -3401,9 +3402,6 @@ int wolfSSH_ProcessBuffer(WOLFSSH_CTX* ctx,
}
derSz = (word32)ret;
}
else {
return WS_UNIMPLEMENTED_E;
}

/* Maybe decrypt */

Expand Down
9 changes: 5 additions & 4 deletions tests/unit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11227,14 +11227,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) {
Expand Down
Loading