WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #72 from ejohnstown/static-fixes 

fix a handful of clang static analysis warnings
pull/74/head
JacobBarthelmeh 2018-06-07 09:38:46 -06:00 committed by GitHub
parent 56f471ffc9 3ab6f4fbd1
commit 0fc6f343b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/server/server.c
View File

@ -564,8 +564,6 @@ THREAD_RETURN WOLFSSH_THREAD server_test(void* args)
byte buf[SCRATCH_BUFFER_SZ]; byte buf[SCRATCH_BUFFER_SZ];
word32 bufSz; word32 bufSz;
bufName = useEcc ? "./keys/server-key-ecc.der" :
"./keys/server-key-rsa.der" ;
bufSz = load_key(useEcc, buf, SCRATCH_BUFFER_SZ); bufSz = load_key(useEcc, buf, SCRATCH_BUFFER_SZ);
if (bufSz == 0) { if (bufSz == 0) {
fprintf(stderr, "Couldn't load key.\n"); fprintf(stderr, "Couldn't load key.\n");

8
src/internal.c
View File

@ -1038,9 +1038,11 @@ int ChannelRemove(WOLFSSH* ssh, word32 channel, byte peer)
if (ssh == NULL) if (ssh == NULL)
ret = WS_BAD_ARGUMENT; ret = WS_BAD_ARGUMENT;
list = ssh->channelList; if (ret == WS_SUCCESS) {
if (list == NULL) list = ssh->channelList;
ret = WS_INVALID_CHANID; if (list == NULL)
ret = WS_INVALID_CHANID;
}
if (ret == WS_SUCCESS) { if (ret == WS_SUCCESS) {
WOLFSSH_CHANNEL* prev = NULL; WOLFSSH_CHANNEL* prev = NULL;

11
tests/unit.c
View File

@ -397,7 +397,8 @@ static int test_Errors(void)
#else #else
int i, j = 0; int i, j = 0;
/* Values that are not or no longer error codes. */ /* Values that are not or no longer error codes. */
int missing[] = { WS_SUCCESS }; int missing[] = { 0 };
int missingSz = (int)sizeof(missing)/sizeof(missing[0]);
/* Check that all errors have a string and it's the same through the two /* Check that all errors have a string and it's the same through the two
* APIs. Check that the values that are not errors map to the unknown * APIs. Check that the values that are not errors map to the unknown
@ -405,15 +406,15 @@ static int test_Errors(void)
for (i = WS_SUCCESS; i >= WS_LAST_E; i--) { for (i = WS_SUCCESS; i >= WS_LAST_E; i--) {
errStr = wolfSSH_ErrorToName(i); errStr = wolfSSH_ErrorToName(i);
if (i != missing[j]) { if (j < missingSz && i == missing[j]) {
if (errStr == unknownStr) { j++;
if (errStr != unknownStr) {
result = -105; result = -105;
break; break;
} }
} }
else { else {
j++; if (errStr == unknownStr) {
if (errStr != unknownStr) {
result = -106; result = -106;
break; break;
} }