Skip to content

Fix the cppcheck 2.13 findings #1357

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
Open

Fix the cppcheck 2.13 findings #1357

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
fb26dcc
Fix the cppcheck 2.13 findings
ejohnstown Oct 30, 2026
0f52994
Fail the cppcheck job on a finding
ejohnstown Oct 30, 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
4 changes: 3 additions & 1 deletion .github/workflows/cppcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
- name: Run CppCheck
id: cpp_check_run
if: always()
# bash gets -o pipefail, so tee keeps cppcheck's exit code
shell: bash
run: >
cppcheck
-UWSCPFILEHDR -UXSNPRINTF
Expand All @@ -41,7 +43,7 @@ jobs:
3>&1 1>&2 2>&3 | tee cppcheck.txt

- name: Upload cppcheck results as artifact
if: always()
if: failure() && steps.cpp_check_run.outcome == 'failure'
uses: actions/upload-artifact@v7
with:
name: wolfssh-${{ github.sha }}-cppcheck_results.txt
Expand Down
3 changes: 2 additions & 1 deletion apps/wolfsshd/wolfsshd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4631,8 +4631,9 @@ static int StartSSHD(int argc, char** argv)
"wolfSSH_HostKeyStore. Use one or the other.");
ret = WS_BAD_ARGUMENT;
}
else
#endif
if (ret == WS_SUCCESS) {
{
wolfSSHD_ConfigSetHostKeyFile(conf, hostKeyFile);
}
}
Expand Down
27 changes: 9 additions & 18 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25464,28 +25464,19 @@ static int CompositeEccSign(void* key, WC_RNG* rng, void* heap,
word32 rSz = MAX_ECC_BYTES + ECC_MAX_PAD_SZ,
sSz = MAX_ECC_BYTES + ECC_MAX_PAD_SZ;
#ifdef WOLFSSH_SMALL_STACK
byte* rBuf = NULL;
byte* sBuf = NULL;

rBuf = (byte*)WMALLOC(MAX_ECC_BYTES + ECC_MAX_PAD_SZ, heap,
byte* rBuf = (byte*)WMALLOC(MAX_ECC_BYTES + ECC_MAX_PAD_SZ, heap,
DYNTYPE_TEMP);
byte* sBuf = (byte*)WMALLOC(MAX_ECC_BYTES + ECC_MAX_PAD_SZ, heap,
DYNTYPE_TEMP);
if (rBuf == NULL)

if (rBuf == NULL || sBuf == NULL)
ret = WS_MEMORY_E;
if (ret == 0) {
sBuf = (byte*)WMALLOC(MAX_ECC_BYTES + ECC_MAX_PAD_SZ, heap,
DYNTYPE_TEMP);
if (sBuf == NULL)
ret = WS_MEMORY_E;
}
else
#else
byte rStore[MAX_ECC_BYTES + ECC_MAX_PAD_SZ];
byte sStore[MAX_ECC_BYTES + ECC_MAX_PAD_SZ];
byte* rBuf = rStore;
byte* sBuf = sStore;
byte rBuf[MAX_ECC_BYTES + ECC_MAX_PAD_SZ];
byte sBuf[MAX_ECC_BYTES + ECC_MAX_PAD_SZ];
#endif

/* NULL only when a small-stack allocation above failed */
if (rBuf != NULL && sBuf != NULL) {
{
ret = wc_ecc_sig_to_rs(asnSig, asnSigSz, rBuf, &rSz, sBuf, &sSz);
}
if (ret == 0) {
Expand Down
1 change: 1 addition & 0 deletions src/wolfsftp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4418,6 +4418,7 @@ int wolfSSH_SFTP_RecvWrite(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
/* FXF_APPEND: the offset is ignored and the O_APPEND
* fd puts the write at EOF. pwrite() would honor the
* offset on every POSIX system but Linux. */
/* cppcheck-suppress constStatement */
ret = WWRITE(ssh->fs, fd, (byte*)str + written,
strSz - written);
}
Expand Down
Loading