Skip to content

wolfSSH_get_fd: return socket sentinel on NULL #1247

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

Merged
padelsbach merged 2 commits into from
Sep 11, 2026
Merged

wolfSSH_get_fd: return socket sentinel on NULL #1247

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
30c4d08
wolfSSH_get_fd: return socket sentinel on NULL
ejohnstown Jul 18, 2026
bee9b33
tests: pin the get_fd invalid-socket sentinel
ejohnstown Sep 11, 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
5 changes: 4 additions & 1 deletion src/ssh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,13 @@ WS_SOCKET_T wolfSSH_get_fd(const WOLFSSH* ssh)
if (ssh)
return ssh->rfd;

/* Return the same invalid-socket sentinel wolfSSH_new() initializes
* rfd/wfd to, rather than an error enum, so callers get a value of the
* socket type they can compare against. */
#ifdef USE_WINDOWS_API
return INVALID_SOCKET;
#else
return WS_BAD_ARGUMENT;
return -1;
Comment thread
ejohnstown marked this conversation as resolved.
#endif
}

Expand Down
6 changes: 5 additions & 1 deletion tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,11 @@ static void test_wolfSSH_set_fd(void)

AssertIntNE(WS_SUCCESS, wolfSSH_set_fd(NULL, fd));
check = wolfSSH_get_fd(NULL);
AssertFalse(WS_SUCCESS == check);
#ifdef USE_WINDOWS_API
AssertTrue(INVALID_SOCKET == check);
#else
AssertTrue(-1 == check);
#endif

AssertIntEQ(WS_SUCCESS, wolfSSH_set_fd(ssh, fd));
check = wolfSSH_get_fd(ssh);
Expand Down
Loading