Skip to content

Static analysis fixes #881

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
JacobBarthelmeh merged 5 commits into from
Feb 26, 2026
+16 −10
Merged

Static analysis fixes #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c802a7f
Fix null check for duplicated string
ejohnstown Feb 25, 2026
05ec832
Check bounds on addition with value from peer
ejohnstown Feb 25, 2026
13ffca4
Fix null dereference after failed channel lookup
ejohnstown Feb 25, 2026
d6e1b04
Check correct pointer for null
ejohnstown Feb 25, 2026
961810b
Fix wrong bitwise operator for testing attribute
ejohnstown Feb 25, 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
2 changes: 1 addition & 1 deletion apps/wolfsshd/auth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ static int CheckPasswordUnix(const char* usr, const byte* pw, word32 pwSz, WOLFS
}
if (ret == WS_SUCCESS) {
storedHashCpy = WSTRDUP(storedHash, NULL, DYNTYPE_STRING);
if (storedHash == NULL) {
if (storedHashCpy == NULL) {
wolfSSH_Log(WS_LOG_ERROR,
"[SSHD] Error getting stored hash copy");
ret = WS_MEMORY_E;
Expand Down
2 changes: 1 addition & 1 deletion apps/wolfsshd/wolfsshd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ static int SetupCTX(WOLFSSHD_CONFIG* conf, WOLFSSH_CTX** ctx,

/* create a new WOLFSSH_CTX */
*ctx = wolfSSH_CTX_new(WOLFSSH_ENDPOINT_SERVER, NULL);
if (ctx == NULL) {
if (*ctx == NULL) {
wolfSSH_Log(WS_LOG_ERROR, "[SSHD] Couldn't allocate SSH CTX data.");
ret = WS_MEMORY_E;
}
Expand Down
15 changes: 10 additions & 5 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#endif

#include <stdio.h>
#include <stdint.h>
#include <wolfssh/ssh.h>
#include <wolfssh/internal.h>
#include <wolfssh/log.h>
Expand Down Expand Up @@ -9469,11 +9470,15 @@ static int DoChannelWindowAdjust(WOLFSSH* ssh,
WLOG(WS_LOG_INFO, " peerWindowSz = %u",
channel->peerWindowSz);

channel->peerWindowSz += bytesToAdd;

WLOG(WS_LOG_INFO, " update peerWindowSz = %u",
channel->peerWindowSz);

if (bytesToAdd > UINT32_MAX - channel->peerWindowSz) {
ret = WS_OVERFLOW_E;
WLOG(WS_LOG_DEBUG, "peer window adjust would overflow");
}
else {
channel->peerWindowSz += bytesToAdd;
WLOG(WS_LOG_INFO, " update peerWindowSz = %u",
channel->peerWindowSz);
}
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/wolfscp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,9 +1423,10 @@ int ReceiveScpMessage(WOLFSSH* ssh)
if (err == 0) {
WOLFSSH_CHANNEL* channel;
channel = wolfSSH_ChannelFind(ssh, lastChannel, WS_CHANNEL_ID_SELF);
if (channel == NULL)
if (channel == NULL) {
ret = WS_INVALID_CHANID;
if (wolfSSH_ChannelGetEof(channel)) {
}
else if (wolfSSH_ChannelGetEof(channel)) {
return WS_EOF;
}
}
Expand Down Expand Up @@ -2217,7 +2218,7 @@ static int GetFileStats(void *fs, ScpSendCtx* ctx, const char* fileName,
(word64)ctx->s.ftLastWriteTime.dwLowDateTime;

*fileMode = 0555 |
(ctx->s.dwFileAttributes | FILE_ATTRIBUTE_READONLY ? 0 : 0200);
(ctx->s.dwFileAttributes & FILE_ATTRIBUTE_READONLY ? 0 : 0200);
*fileMode |= (ctx->s.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? 0x4000 : 0;
#else
if (WSTAT(fs, fileName, &ctx->s) < 0) {
Expand Down